From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 Apr 2012 01:22:25 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~356
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fda8c8fa718a63e4f8106ed628978fed72837c13;p=emacs.git

Merge from trunk.
---

fda8c8fa718a63e4f8106ed628978fed72837c13