Merge commit 'upstream/2.3.1+dfsg'
authorRuss Allbery <rra@debian.org>
Fri, 18 Dec 2009 00:52:54 +0000 (16:52 -0800)
committerRuss Allbery <rra@debian.org>
Fri, 18 Dec 2009 00:52:54 +0000 (16:52 -0800)

Trivial merge