]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 20 Apr 2011 06:27:19 +0000 (23:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 20 Apr 2011 06:27:19 +0000 (23:27 -0700)

Trivial merge