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)

Trivial merge