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

Merge from trunk.
---

8dcd9adf660cbe463a3e56707f5c15d8f34b2f87