Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Tue, 14 May 2013 20:15:19 +0000 (22:15 +0200)
committerFranck Joncourt <franck@debian.org>
Tue, 14 May 2013 20:15:19 +0000 (22:15 +0200)

Trivial merge