From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 22 May 2011 21:16:24 +0000 (-0700)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~206
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f7390b223e8f55faab66259515eed073ebf0f9b;p=emacs.git

Merge from mainline.
---

3f7390b223e8f55faab66259515eed073ebf0f9b