Merge commit 'upstream/23.2'
authorJoachim Wiedorn <ad_debian@joonet.de>
Sat, 7 May 2011 12:34:03 +0000 (14:34 +0200)
committerJoachim Wiedorn <ad_debian@joonet.de>
Sat, 7 May 2011 12:34:03 +0000 (14:34 +0200)
commit5a2473f0b614812b537270318281f8654c80e265
treef7d6aed856b055ea7ad4da8af2ece0c5cfc4a2fd
parent95d9596678e244b6cba4c94982a9688ce0a759f9
parent0a7ead9db7967764f0d93d30f9a83c94cb6fc358
Merge commit 'upstream/23.2'