Merge tag 'upstream/2.10_beta1+ds' into experimental
authorgregor herrmann <gregoa@debian.org>
Fri, 29 Mar 2013 16:26:09 +0000 (17:26 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 29 Mar 2013 16:26:09 +0000 (17:26 +0100)
Upstream version 2.10~beta1+ds


Trivial merge