Merge remote-tracking branch 'upstream/master' into save_rc_stanza
authorFranck Joncourt <franck@debian.org>
Mon, 20 May 2013 09:08:33 +0000 (11:08 +0200)
committerFranck Joncourt <franck@debian.org>
Mon, 20 May 2013 09:08:33 +0000 (11:08 +0200)

Trivial merge