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)

Trivial merge