From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 16 Feb 2011 00:21:32 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~794^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5740d4abab3bcf1b2b98b725c3292046cc1f4c58;p=emacs.git

Merge from mainline.
---

5740d4abab3bcf1b2b98b725c3292046cc1f4c58