]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Fri, 5 Feb 2010 14:28:04 +0000 (09:28 -0500)
committerEli Zaretskii <eliz@gnu.org>
Fri, 5 Feb 2010 14:28:04 +0000 (09:28 -0500)

Trivial merge