Merge branch 'upstream' into debian
authorBdale Garbee <bdale@gag.com>
Sat, 13 Aug 2011 18:30:46 +0000 (12:30 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 13 Aug 2011 18:30:46 +0000 (12:30 -0600)

Trivial merge