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

Merge from trunk.
---

899b41b6e37a321e14559d2cf3c05ea3f8063811