Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 16 Apr 2013 14:10:51 +0000 (17:10 +0300)
committerEli Zaretskii <eliz@gnu.org>
Tue, 16 Apr 2013 14:10:51 +0000 (17:10 +0300)

Trivial merge