Merge commit 'upstream/0.4.5+svn3450_dfsg1'
authorAlessio Treglia <alessio@debian.org>
Fri, 3 Feb 2012 22:24:54 +0000 (23:24 +0100)
committerAlessio Treglia <alessio@debian.org>
Fri, 3 Feb 2012 22:24:54 +0000 (23:24 +0100)

Trivial merge