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)
commit2800c4d3155df0768410a675359fb360dfe2e791
tree26f88ac8793567324f8860b616fa5dc674945e22
parent54ab7d34c56aca38b600cdc3e37fc215e7abec06
parent6139439fac7839d2c13ec9c1045b581d3941b2fc
Merge from trunk.