Merge tag 'upstream/1.6'
authorgregor herrmann <gregoa@debian.org>
Wed, 2 May 2012 16:30:47 +0000 (18:30 +0200)
committergregor herrmann <gregoa@debian.org>
Wed, 2 May 2012 16:30:47 +0000 (18:30 +0200)
Upstream version 1.6


Trivial merge