Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Sun, 5 May 2013 19:47:21 +0000 (21:47 +0200)
committerFranck Joncourt <franck@debian.org>
Sun, 5 May 2013 19:47:21 +0000 (21:47 +0200)

Trivial merge