Merge tag 'upstream/2.9r+ds' into experimental
authorgregor herrmann <gregoa@debian.org>
Mon, 17 Dec 2012 19:05:17 +0000 (20:05 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 17 Dec 2012 19:05:17 +0000 (20:05 +0100)
Upstream version 2.9r+ds

Conflicts:
build.number

--> removed


Trivial merge