Merge tag 'upstream/0.9.4+r4180.20120803'
authorgregor herrmann <gregoa@debian.org>
Fri, 3 Aug 2012 15:13:04 +0000 (17:13 +0200)
committergregor herrmann <gregoa@debian.org>
Fri, 3 Aug 2012 15:13:04 +0000 (17:13 +0200)
Upstream version 0.9.4+r4180.20120803


Trivial merge