From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 4 Aug 2011 20:43:14 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~124^2~65
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d9f0172e44ae854a422fd52555f9535ed57f2392;p=emacs.git

Merge from trunk.
---

d9f0172e44ae854a422fd52555f9535ed57f2392