Merge from trunk.
commiteb1dd42a729ab1b9cdcd278767951679480cd4c3
authorEli Zaretskii <eliz@gnu.org>
Fri, 5 Apr 2013 13:10:57 +0000 (5 16:10 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 5 Apr 2013 13:10:57 +0000 (5 16:10 +0300)
tree7a9787eacf9fa495ad8f7caef59bb58a46fbe04a
parent86e9346005b957ddadb73586c9641e68ea12a79d
parent2a417372c4a06fe90c343bc59660268c7a5ac3e9
Merge from trunk.