From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 16 Jun 2011 21:19:55 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~538^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4847e3f0a94e3f24b40b060af528cf4b51d788c5;p=emacs.git

Merge from trunk.
---

4847e3f0a94e3f24b40b060af528cf4b51d788c5