Another merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Wed, 11 Dec 2013 17:06:50 +0000 (19:06 +0200)
committerEli Zaretskii <eliz@gnu.org>
Wed, 11 Dec 2013 17:06:50 +0000 (19:06 +0200)

Trivial merge