From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 6 Aug 2011 00:21:29 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~124^2~64
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3b9a83ed346d1f0c9ab9f0776b527c74e3ca971;p=emacs.git

Merge from trunk.
---

c3b9a83ed346d1f0c9ab9f0776b527c74e3ca971