Merge branch 'master' into core-updates
authorLudovic Courtès <ludo@gnu.org>
Sun, 8 Sep 2013 10:11:32 +0000 (12:11 +0200)
committerLudovic Courtès <ludo@gnu.org>
Sun, 8 Sep 2013 10:11:32 +0000 (12:11 +0200)

Trivial merge