]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorBill Wohler <wohler@newt.com>
Mon, 4 Jul 2011 02:58:14 +0000 (19:58 -0700)
committerBill Wohler <wohler@newt.com>
Mon, 4 Jul 2011 02:58:14 +0000 (19:58 -0700)

Trivial merge