Merge remote-tracking branch 'upstream/debian/sid' into bugfix/coverity
authorMichael Vogt <mvo@debian.org>
Mon, 5 Aug 2013 20:51:30 +0000 (22:51 +0200)
committerMichael Vogt <mvo@debian.org>
Mon, 5 Aug 2013 20:51:30 +0000 (22:51 +0200)

Trivial merge