Merge tag 'upstream/2.9.2+ds' into experimental
authorgregor herrmann <gregoa@debian.org>
Mon, 14 Jan 2013 16:32:25 +0000 (17:32 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 14 Jan 2013 16:32:25 +0000 (17:32 +0100)
Upstream version 2.9.2+ds


Trivial merge