Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 21:13:12 +0000 (16:13 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 21:13:12 +0000 (16:13 -0500)

Trivial merge