Merge tag 'upstream/0.4.5+svn4002_dfsg0' into master.experimental
authorAlessio Treglia <alessio@debian.org>
Fri, 6 Apr 2012 08:31:54 +0000 (10:31 +0200)
committerAlessio Treglia <alessio@debian.org>
Fri, 6 Apr 2012 08:31:54 +0000 (10:31 +0200)
Upstream version 0.4.5+svn4002~dfsg0


Trivial merge