Merge branch 'upstream' into debian
authorBdale Garbee <bdale@gag.com>
Wed, 9 Mar 2011 04:42:24 +0000 (21:42 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 9 Mar 2011 04:42:24 +0000 (21:42 -0700)

Trivial merge