Merge tag 'upstream/0.9.4+r4182.20130608'
authorgregor herrmann <gregoa@debian.org>
Sat, 8 Jun 2013 15:34:22 +0000 (17:34 +0200)
committergregor herrmann <gregoa@debian.org>
Sat, 8 Jun 2013 15:34:22 +0000 (17:34 +0200)
Upstream version 0.9.4+r4182.20130608


Trivial merge