]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 8 Oct 2011 06:17:40 +0000 (23:17 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 8 Oct 2011 06:17:40 +0000 (23:17 -0700)

Trivial merge