Merge commit 'upstream/2.3.1+dfsg' into bug/init
authorRuss Allbery <rra@debian.org>
Sun, 3 Jan 2010 08:05:50 +0000 (00:05 -0800)
committerRuss Allbery <rra@debian.org>
Sun, 3 Jan 2010 08:05:50 +0000 (00:05 -0800)

Trivial merge