Merge branch 'upstream' into debian
authorBdale Garbee <bdale@gag.com>
Sun, 16 Sep 2012 22:28:51 +0000 (16:28 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 16 Sep 2012 22:28:51 +0000 (16:28 -0600)

Trivial merge