From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 20 Apr 2011 06:27:19 +0000 (-0700)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~239
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=997bfc65800964e26fb281c8d7490b060f4a1d87;p=emacs.git

Merge from mainline.
---

997bfc65800964e26fb281c8d7490b060f4a1d87