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

Merge from mainline.
---

f12f551b2c38748ed10ec8c350faa23516f7c705