Merge branch 'upstream' into debian
authorBdale Garbee <bdale@gag.com>
Wed, 6 Oct 2010 21:46:08 +0000 (15:46 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 6 Oct 2010 21:46:08 +0000 (15:46 -0600)

Trivial merge