Merge from trunk.
commit76efa828369a583650cf661a327d5698891a7a90
authorEli Zaretskii <eliz@gnu.org>
Wed, 17 Apr 2013 16:37:15 +0000 (17 19:37 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 17 Apr 2013 16:37:15 +0000 (17 19:37 +0300)
tree514ed86d637863695c07d1125d287c11383a509c
parent2d0d2952da64bae2af67014b22a3b8caa9aef810
parent083850a6a195c5d536bd4cd344b5917b225597cc
Merge from trunk.