Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Wed, 24 Apr 2013 19:12:03 +0000 (22:12 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 24 Apr 2013 19:12:03 +0000 (22:12 +0300)

Trivial merge