Merge commit 'upstream/2.2'
authorRuss Allbery <rra@debian.org>
Mon, 10 Aug 2009 22:26:58 +0000 (15:26 -0700)
committerRuss Allbery <rra@debian.org>
Mon, 10 Aug 2009 22:26:58 +0000 (15:26 -0700)
commit67276609bd1e4ced2e01b9b70d9d40638295e38e
treec804dba9a67e34bcc3b3736c15e7efc2475bb7d7
parente9336370eda45e7fa4ccc94dd659642f9aa936b7
parentbe102f2a5fc6f24d45dd9eea63e76581c246fb3f
Merge commit 'upstream/2.2'