From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 25 May 2012 20:31:25 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~6^2~106
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8825930890470898883be9841d6a0aa3d6ff6623;p=emacs.git

Merge from trunk.
---

8825930890470898883be9841d6a0aa3d6ff6623