From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 25 Feb 2011 07:36:37 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~677^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4394ee04741d5fe2fd4cc7a7ee821e1f8a3f2d32;p=emacs.git

Merge from mainline.
---

4394ee04741d5fe2fd4cc7a7ee821e1f8a3f2d32