Merge branch 'upstream' into debian
authorBdale Garbee <bdale@gag.com>
Fri, 22 Jul 2011 16:04:49 +0000 (18:04 +0200)
committerBdale Garbee <bdale@gag.com>
Fri, 22 Jul 2011 16:04:49 +0000 (18:04 +0200)

Trivial merge