Merge branch 'upstream' into debian
authorBdale Garbee <bdale@gag.com>
Fri, 25 Nov 2011 03:56:15 +0000 (20:56 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 25 Nov 2011 03:56:15 +0000 (20:56 -0700)

Trivial merge