From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 14 Apr 2012 05:16:02 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~362
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3bace81626cc6ecdffc7901f3d03aa051d18c0af;p=emacs.git

Merge from trunk.
---

3bace81626cc6ecdffc7901f3d03aa051d18c0af