Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 10 Dec 2013 17:56:03 +0000 (19:56 +0200)
committerEli Zaretskii <eliz@gnu.org>
Tue, 10 Dec 2013 17:56:03 +0000 (19:56 +0200)

Trivial merge