Merge tag 'upstream/3.002.001'
authorgregor herrmann <gregoa@debian.org>
Fri, 26 Sep 2014 12:13:21 +0000 (14:13 +0200)
committergregor herrmann <gregoa@debian.org>
Fri, 26 Sep 2014 12:13:21 +0000 (14:13 +0200)
Upstream version 3.002.001


Trivial merge