Merge from mainline.
commitc4810d2f26b64517c8fefe9e30b296ca41e3f8bc
authorEli Zaretskii <eliz@gnu.org>
Sat, 2 Jan 2010 10:57:50 +0000 (2 05:57 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 2 Jan 2010 10:57:50 +0000 (2 05:57 -0500)
tree76bc5ababfae1476b41db09c2dbf2c8ad66f64f3
parenta179af9bd20b2e9968506003937a152c1cbb5d9e
parent38c1ba62af2dbc5323cc8f04d297b89183d35813
Merge from mainline.