From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 26 Aug 2011 05:05:13 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~67
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fcbc5f60ee9c1ed2fb8b8b4f36b8a0658250a1bd;p=emacs.git

Merge from trunk.
---

fcbc5f60ee9c1ed2fb8b8b4f36b8a0658250a1bd