From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 3 Sep 2011 05:23:56 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7365023b449c0dcb5eca6afc64b2feb5e578f6a0;p=emacs.git

Merge from trunk.
---

7365023b449c0dcb5eca6afc64b2feb5e578f6a0