Merge commit 'upstream/0.4.5+svn3912_dfsg0' into master.experimental
authorAlessio Treglia <alessio@debian.org>
Sat, 11 Feb 2012 17:45:12 +0000 (18:45 +0100)
committerAlessio Treglia <alessio@debian.org>
Sat, 11 Feb 2012 17:45:12 +0000 (18:45 +0100)

Trivial merge