Merge tag 'upstream/1.7'
authorgregor herrmann <gregoa@debian.org>
Wed, 6 Jun 2012 23:04:04 +0000 (01:04 +0200)
committergregor herrmann <gregoa@debian.org>
Wed, 6 Jun 2012 23:04:04 +0000 (01:04 +0200)
Upstream version 1.7


Trivial merge