]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Jan 2011 00:33:24 +0000 (16:33 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Jan 2011 00:33:24 +0000 (16:33 -0800)

Trivial merge