Merge branch 'master' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 18 Aug 2009 20:03:16 +0000 (14:03 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 18 Aug 2009 20:03:16 +0000 (14:03 -0600)

Trivial merge