Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 20 Apr 2013 08:01:06 +0000 (11:01 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 20 Apr 2013 08:01:06 +0000 (11:01 +0300)
commit47ec731ececec750654e12cbd649e2cd90e069e8
treeae1f5c33a4a1c4e95a1b920dd29d882e31ddb020
parent373b3ea63375d70183e90ce4a1fb7895336813cd
parent806bda47ddb469f6206ecc533458eadae6a5b575
Merge from trunk.