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)
commit163c5e045d4375e2c9cd1d2fdb13455db5d94362
treedafa2dfbf0cb86a3a4a7bcce659efcb8d7ce9af4
parent822e5af92df2888f13647dac74ad50b0fcc5c1e4
parentfb303a3a93c0edc6dffa170e5d7440289532140e
Merge commit 'upstream/2.3.1+dfsg' into bug/init