Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Mon, 25 Jan 2010 17:42:44 +0000 (12:42 -0500)
committerEli Zaretskii <eliz@gnu.org>
Mon, 25 Jan 2010 17:42:44 +0000 (12:42 -0500)
commit639dd35751e5d43072ef14bc679286136a4feae9
tree93a8f5700a211c913d4628607ee6a10f79ad6790
parentb7faba0c9c3d8cb994720e2cccc92a538196d56d
parente2396d80cbf7e9d20c05eff44c1c8f04ecb9341c
Merge from mainline.