Merge branch 'master' into cmd-alias
authorSadrul Habib Chowdhury <sadrul@users.sourceforge.net>
Sat, 24 Jan 2009 01:53:36 +0000 (23 20:53 -0500)
committerSadrul Habib Chowdhury <sadrul@users.sourceforge.net>
Sat, 24 Jan 2009 01:53:36 +0000 (23 20:53 -0500)

Trivial merge