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

Merge from mainline.
---

2098fd549f4c8a00246324a35de6af8144f5b628