Merge tag 'upstream/0.9.4+r4180.20121103'
authorgregor herrmann <gregoa@debian.org>
Sat, 3 Nov 2012 16:31:29 +0000 (17:31 +0100)
committergregor herrmann <gregoa@debian.org>
Sat, 3 Nov 2012 16:31:29 +0000 (17:31 +0100)
Upstream version 0.9.4+r4180.20121103


Trivial merge