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

Merge from trunk.
---

5c6858167926225cc78d3a5ccaee71185f4c0c95