Merge commit 'upstream/0.4.5+svn3450_dfsg2'
authorAlessio Treglia <alessio@debian.org>
Sat, 4 Feb 2012 11:18:33 +0000 (12:18 +0100)
committerAlessio Treglia <alessio@debian.org>
Sat, 4 Feb 2012 11:18:33 +0000 (12:18 +0100)

Trivial merge