Merge tag 'upstream/1.9'
authorgregor herrmann <gregoa@debian.org>
Thu, 13 Jun 2013 16:07:11 +0000 (18:07 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 13 Jun 2013 16:07:11 +0000 (18:07 +0200)
Upstream version 1.9


Trivial merge