Merge tag 'upstream/0.6.0'
authorgregor herrmann <gregoa@debian.org>
Wed, 12 Jun 2013 21:06:21 +0000 (23:06 +0200)
committergregor herrmann <gregoa@debian.org>
Wed, 12 Jun 2013 21:06:21 +0000 (23:06 +0200)
Upstream version 0.6.0


Trivial merge