Merge tag 'upstream/1.8'
authorgregor herrmann <gregoa@debian.org>
Sun, 16 Sep 2012 12:40:15 +0000 (14:40 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 16 Sep 2012 12:40:15 +0000 (14:40 +0200)
Upstream version 1.8


Trivial merge