Merge branch 'upstream' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 23 Mar 2010 01:44:39 +0000 (19:44 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 23 Mar 2010 01:44:39 +0000 (19:44 -0600)

Trivial merge