Merge tag 'upstream/24.0'
authorJoachim Wiedorn <ad_debian@joonet.de>
Sun, 9 Jun 2013 19:14:10 +0000 (21:14 +0200)
committerJoachim Wiedorn <ad_debian@joonet.de>
Sun, 9 Jun 2013 19:14:10 +0000 (21:14 +0200)
Upstream version 24.0


Trivial merge