From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 27 Sep 2011 01:13:58 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~6^2~184
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d99fb284f7ccb502ce12d7bd96350d0e2d3af1b4;p=emacs.git

Merge from trunk.
---

d99fb284f7ccb502ce12d7bd96350d0e2d3af1b4