Merge branch 'upstream' into debian
authorBdale Garbee <bdale@gag.com>
Sun, 18 Mar 2012 10:33:29 +0000 (11:33 +0100)
committerBdale Garbee <bdale@gag.com>
Sun, 18 Mar 2012 10:33:29 +0000 (11:33 +0100)

Trivial merge