Merge commit 'upstream/0.3.4'
authorMichael Prokop <mika@debian.org>
Mon, 2 Jan 2012 10:07:01 +0000 (11:07 +0100)
committerMichael Prokop <mika@debian.org>
Mon, 2 Jan 2012 10:07:01 +0000 (11:07 +0100)

Trivial merge