Merge tag 'upstream/0.9.4+r4180.20120502'
authorgregor herrmann <gregoa@debian.org>
Wed, 2 May 2012 15:04:57 +0000 (17:04 +0200)
committergregor herrmann <gregoa@debian.org>
Wed, 2 May 2012 15:04:57 +0000 (17:04 +0200)
Upstream version 0.9.4+r4180.20120502


Trivial merge