Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Wed, 1 May 2013 17:12:42 +0000 (20:12 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 1 May 2013 17:12:42 +0000 (20:12 +0300)

Trivial merge