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

Merge from mainline.
---

37b3d30244ad822e049b6b20c2eadf5946cb02cc