Merge tag 'upstream/0.9.4+r4182.20130307'
authorgregor herrmann <gregoa@debian.org>
Thu, 7 Mar 2013 16:07:12 +0000 (17:07 +0100)
committergregor herrmann <gregoa@debian.org>
Thu, 7 Mar 2013 16:07:12 +0000 (17:07 +0100)
Upstream version 0.9.4+r4182.20130307


Trivial merge