]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 24 Jul 2011 22:16:20 +0000 (15:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 24 Jul 2011 22:16:20 +0000 (15:16 -0700)

Trivial merge