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

Merge from trunk.
---

c6046b94e58b33ddcfca8f6361ddaf780ba5cb18