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

Merge from mainline.
---

4a8b879b87962d5f37c05d3650f43cc571b22bc7