Merge tag 'upstream/0.9.4+r4178.20120131'
authorgregor herrmann <gregoa@debian.org>
Tue, 31 Jan 2012 18:47:54 +0000 (19:47 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 31 Jan 2012 18:47:54 +0000 (19:47 +0100)
Upstream version 0.9.4+r4178.20120131


Trivial merge