Merge commit 'upstream/0.4.5+svn3912_dfsg1' into master.experimental
authorAlessio Treglia <alessio@debian.org>
Sat, 11 Feb 2012 18:13:38 +0000 (19:13 +0100)
committerAlessio Treglia <alessio@debian.org>
Sat, 11 Feb 2012 18:13:38 +0000 (19:13 +0100)

Trivial merge