Merge branch 'upstream' into bug/init
authorRuss Allbery <rra@debian.org>
Sat, 23 Aug 2008 23:34:15 +0000 (16:34 -0700)
committerRuss Allbery <rra@debian.org>
Sat, 23 Aug 2008 23:34:15 +0000 (16:34 -0700)

Trivial merge