Merge tag 'upstream/0.9.4+r4182.20130909'
authorgregor herrmann <gregoa@debian.org>
Mon, 9 Sep 2013 15:22:04 +0000 (17:22 +0200)
committergregor herrmann <gregoa@debian.org>
Mon, 9 Sep 2013 15:22:04 +0000 (17:22 +0200)
Upstream version 0.9.4+r4182.20130909


Trivial merge