Merge branch 'upstream' into dfsg-orig
authorBdale Garbee <bdale@gag.com>
Fri, 8 Oct 2010 03:39:11 +0000 (21:39 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 8 Oct 2010 03:39:11 +0000 (21:39 -0600)

Trivial merge