Merge commit 'upstream/0.4.5+svn3462_dfsg0'
authorAlessio Treglia <alessio@debian.org>
Fri, 10 Feb 2012 21:48:53 +0000 (22:48 +0100)
committerAlessio Treglia <alessio@debian.org>
Fri, 10 Feb 2012 21:48:53 +0000 (22:48 +0100)

Trivial merge