Merge commit 'upstream/2.3'
authorRuss Allbery <rra@debian.org>
Fri, 6 Nov 2009 22:57:07 +0000 (14:57 -0800)
committerRuss Allbery <rra@debian.org>
Fri, 6 Nov 2009 22:57:07 +0000 (14:57 -0800)
commitea6814c2fd6fe6fd5f4256bfb1aba006a6e5a407
treea13a7c380ab8a430015728dac1fd2724201c9522
parent32cb50deb59df8e8ac16fa81f55c237584135857
parent790ffd969559396e6117f04b3e6e475a8b0e2f49
Merge commit 'upstream/2.3'