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

Merge from trunk.
---

2f241ea5576dd3c6ad54b8c14828c8e934fa34a9