Merge branch 'master' of cobramush.org:cobramush
authorRick L Bird <nveid@yahoo.com>
Sun, 17 Apr 2011 22:27:25 +0000 (18:27 -0400)
committerRick L Bird <nveid@yahoo.com>
Sun, 17 Apr 2011 22:27:25 +0000 (18:27 -0400)

Trivial merge