From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 18 Apr 2012 17:07:06 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~346
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=99c8ec3fbfc439845c29144a61a42a5183441eaf;p=emacs.git

Merge from trunk.
---

99c8ec3fbfc439845c29144a61a42a5183441eaf