Merge branch 'core-updates'
authorLudovic Courtès <ludo@gnu.org>
Thu, 26 Sep 2013 23:30:57 +0000 (01:30 +0200)
committerLudovic Courtès <ludo@gnu.org>
Thu, 26 Sep 2013 23:30:57 +0000 (01:30 +0200)

Trivial merge