Merge commit 'upstream/0.4.5+svn3959_dfsg0' into master.experimental
authorAlessio Treglia <alessio@debian.org>
Thu, 22 Mar 2012 10:06:31 +0000 (11:06 +0100)
committerAlessio Treglia <alessio@debian.org>
Thu, 22 Mar 2012 10:06:31 +0000 (11:06 +0100)

Trivial merge