Merge tag 'upstream/0.4.5+svn3915_dfsg0' into master.experimental
authorAlessio Treglia <alessio@debian.org>
Mon, 13 Feb 2012 15:31:23 +0000 (16:31 +0100)
committerAlessio Treglia <alessio@debian.org>
Mon, 13 Feb 2012 15:31:23 +0000 (16:31 +0100)
Upstream version 0.4.5+svn3915~dfsg0


Trivial merge