Merge tag 'upstream/2.10_beta2+ds'
authorgregor herrmann <gregoa@debian.org>
Fri, 21 Jun 2013 16:30:38 +0000 (18:30 +0200)
committergregor herrmann <gregoa@debian.org>
Fri, 21 Jun 2013 16:30:38 +0000 (18:30 +0200)
Upstream version 2.10~beta2+ds


Trivial merge