From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 19 Jan 2011 23:58:00 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~194
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38ec24bf555387224ba36a7ead82d6e4d89018ed;p=emacs.git

Merge from mainline.
---

38ec24bf555387224ba36a7ead82d6e4d89018ed