Merge tag 'upstream/2.9.1+ds' into experimental
authorgregor herrmann <gregoa@debian.org>
Tue, 1 Jan 2013 16:08:01 +0000 (17:08 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 1 Jan 2013 16:08:01 +0000 (17:08 +0100)
Upstream version 2.9.1+ds


Trivial merge