From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 14 Oct 2011 06:14:17 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~6^2~149
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91107bd98003435fbeead3325ce694248863da39;p=emacs.git

Merge from trunk.
---

91107bd98003435fbeead3325ce694248863da39