From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 25 Aug 2011 22:38:52 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~68
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef25feb44365ed60211bc0b965e421b58b3dc075;p=emacs.git

Merge from trunk.
---

ef25feb44365ed60211bc0b965e421b58b3dc075