Merge from upstream.
commita179af9bd20b2e9968506003937a152c1cbb5d9e
authorEli Zaretskii <eliz@gnu.org>
Sat, 2 Jan 2010 10:22:05 +0000 (2 05:22 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 2 Jan 2010 10:22:05 +0000 (2 05:22 -0500)
tree2e903858b7fd9cd1efda2bd38c4ac9b20a0e867f
parent3b8fb4b39271ee1abaa725fbda501e7f10a708c1
parentab507311880d1b971a6bfad2676d92548041f63f
Merge from upstream.