Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:51:13 +0000 (19:51 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:51:13 +0000 (19:51 +0200)

Trivial merge