Merge commit 'upstream/0.3.2'
authorMichael Prokop <mika@debian.org>
Mon, 14 Dec 2009 01:45:47 +0000 (02:45 +0100)
committerMichael Prokop <mika@debian.org>
Mon, 14 Dec 2009 01:45:47 +0000 (02:45 +0100)

Trivial merge