]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 6 Feb 2010 17:50:45 +0000 (12:50 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 6 Feb 2010 17:50:45 +0000 (12:50 -0500)

Trivial merge