From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 20 Jul 2011 16:32:42 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~159^2~9^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=49b602e24ecb3fe085d45ac385e1bfda82252090;p=emacs.git

Merge from trunk.
---

49b602e24ecb3fe085d45ac385e1bfda82252090