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

Merge from trunk.
---

358e1dd2b2e984069dc761ee4266efdad33a213f