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