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

Merge from trunk.
---

3019ceda0d720be62102bd76d52cfcab67ac012a