Merge tag 'upstream/1.5'
authorgregor herrmann <gregoa@debian.org>
Tue, 21 Feb 2012 18:45:15 +0000 (19:45 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 21 Feb 2012 18:45:15 +0000 (19:45 +0100)
Upstream version 1.5


Trivial merge