Merge branch 'upstream'
authorRuss Allbery <rra@debian.org>
Tue, 24 Jun 2008 18:23:06 +0000 (11:23 -0700)
committerRuss Allbery <rra@debian.org>
Tue, 24 Jun 2008 18:23:06 +0000 (11:23 -0700)

Trivial merge