From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 12 Feb 2011 22:40:06 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~794^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6d302144c218f12bd380344ae2d3ed87a6ea9327;p=emacs.git

Merge from mainline.
---

6d302144c218f12bd380344ae2d3ed87a6ea9327