]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 04:40:07 +0000 (20:40 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 04:40:07 +0000 (20:40 -0800)

Trivial merge