]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 9 Jan 2010 16:27:11 +0000 (11:27 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 9 Jan 2010 16:27:11 +0000 (11:27 -0500)

Trivial merge