Merge commit 'upstream/1.3'
authorRuss Allbery <rra@debian.org>
Fri, 6 Nov 2009 19:02:17 +0000 (11:02 -0800)
committerRuss Allbery <rra@debian.org>
Fri, 6 Nov 2009 19:02:17 +0000 (11:02 -0800)

Trivial merge