Merge branch 'upstream' into debian
authorBdale Garbee <bdale@gag.com>
Sat, 11 Jun 2011 14:31:37 +0000 (08:31 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 11 Jun 2011 14:31:37 +0000 (08:31 -0600)

Trivial merge