Merge tag 'upstream/0.9.4+r4180.20130204'
authorgregor herrmann <gregoa@debian.org>
Tue, 5 Feb 2013 16:03:47 +0000 (17:03 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 5 Feb 2013 16:03:47 +0000 (17:03 +0100)
Upstream version 0.9.4+r4180.20130204


Trivial merge