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)
commit1d60c962bfb5de8bb79b23a86fbff11f7c599c94
tree070c586229366f61a3fc5deb30aa4f8deac11453
parent5d5c7898f19009c2a11940bdec411216cd8fe474
parentfb303a3a93c0edc6dffa170e5d7440289532140e
Merge commit 'upstream/2.3.1+dfsg' into debian