Merge tag 'upstream/0.5.0+svn4281_dfsg1'
authorAlessio Treglia <alessio@debian.org>
Wed, 16 Jan 2013 16:08:56 +0000 (16:08 +0000)
committerAlessio Treglia <alessio@debian.org>
Wed, 16 Jan 2013 16:08:56 +0000 (16:08 +0000)
Upstream version 0.5.0+svn4281~dfsg1


Trivial merge