Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Fri, 1 Jan 2010 19:30:06 +0000 (14:30 -0500)
committerEli Zaretskii <eliz@gnu.org>
Fri, 1 Jan 2010 19:30:06 +0000 (14:30 -0500)

Trivial merge