Merge tag 'upstream/3.002'
authorgregor herrmann <gregoa@debian.org>
Wed, 27 Aug 2014 02:35:28 +0000 (19:35 -0700)
committergregor herrmann <gregoa@debian.org>
Wed, 27 Aug 2014 02:35:28 +0000 (19:35 -0700)
Upstream version 3.002


Trivial merge