]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 05:52:31 +0000 (22:52 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 05:52:31 +0000 (22:52 -0700)

Trivial merge