Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 16 Apr 2013 16:57:06 +0000 (19:57 +0300)
committerEli Zaretskii <eliz@gnu.org>
Tue, 16 Apr 2013 16:57:06 +0000 (19:57 +0300)
commit19c443d277831d6d128d2e6a4e300258b8666bea
treecf0269301ede01c2261ead71885f96aad747882c
parent50aac8891209d63b5793289715026655175b2139
parent613f948181f88d8180f136c73cdfd8d811329452
Merge from trunk.