Imported Upstream version 0.3.3 - merge fix
authorMichael Prokop <mika@debian.org>
Wed, 17 Feb 2010 00:47:53 +0000 (01:47 +0100)
committerMichael Prokop <mika@debian.org>
Wed, 17 Feb 2010 00:49:14 +0000 (01:49 +0100)

Trivial merge