Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Sun, 16 Jun 2013 20:28:26 +0000 (22:28 +0200)
committerFranck Joncourt <franck@debian.org>
Sun, 16 Jun 2013 20:28:26 +0000 (22:28 +0200)

Trivial merge