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

Merge from trunk.
---

ad85a071cc6d583041969d300793c92f21a54696