From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 14 Jan 2011 00:33:24 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=096d914f5d64f1606be8f6c2674c69c8de4eb5b3;p=emacs.git

Merge from mainline.
---

096d914f5d64f1606be8f6c2674c69c8de4eb5b3