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

Trivial merge