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

Trivial merge