]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2011 16:21:23 +0000 (09:21 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2011 16:21:23 +0000 (09:21 -0700)

Trivial merge