From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 11 Feb 2011 01:32:13 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~794^2~15
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=78998ca9cf65cc65579c8b756d35a2db9d3c8ef7;p=emacs.git

Merge from mainline.
---

78998ca9cf65cc65579c8b756d35a2db9d3c8ef7