Merge branch 'master' into debian
authorBdale Garbee <bdale@gag.com>
Wed, 19 Aug 2009 00:09:59 +0000 (18:09 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 19 Aug 2009 00:09:59 +0000 (18:09 -0600)

Trivial merge