Merge branch 'upstream' into debian
authorRuss Allbery <rra@debian.org>
Wed, 5 Aug 2009 22:38:41 +0000 (15:38 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 5 Aug 2009 22:38:41 +0000 (15:38 -0700)

Trivial merge