Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 30 Jan 2010 13:50:39 +0000 (08:50 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 30 Jan 2010 13:50:39 +0000 (08:50 -0500)
commit0a762a3a21b8d1053751968200331e1a87e2ad22
tree3ce5de3b8b1607229ee5f52ffe89d40cf64ffb6c
parent6e7d621c18f9645c886c0bb4fac69ec5c9c1fd12
parent944c7a26953d6b4b107fe7a14a05cd1d3459bd17
Merge from mainline.