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

Trivial merge