Merge branch 'upstream' into debian
authorRuss Allbery <rra@debian.org>
Fri, 6 Nov 2009 22:57:51 +0000 (14:57 -0800)
committerRuss Allbery <rra@debian.org>
Fri, 6 Nov 2009 22:57:51 +0000 (14:57 -0800)
commit0175b74e536252aa0d6d74676700993484e4ac9f
treea13a7c380ab8a430015728dac1fd2724201c9522
parentb165f7948b2daa71f4a772a2f867f4b013bfa76e
parent790ffd969559396e6117f04b3e6e475a8b0e2f49
Merge branch 'upstream' into debian