Merge branch 'upstream'
authorLuk Claes <luk@debian.org>
Fri, 10 May 2013 08:09:21 +0000 (10:09 +0200)
committerLuk Claes <luk@debian.org>
Fri, 10 May 2013 08:09:21 +0000 (10:09 +0200)

Trivial merge