From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 26 Sep 2011 05:52:31 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~6^2~189
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8de9005d3cc8c605efa5a1eb9bef728a09dbde24;p=emacs.git

Merge from trunk.
---

8de9005d3cc8c605efa5a1eb9bef728a09dbde24