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

Trivial merge