From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 6 Mar 2010 10:16:27 +0000 (-0500)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~635^2~9
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9dbadf5f1a700c5790837738410c06b481cd2222;p=emacs.git

Merge from mainline.
---

9dbadf5f1a700c5790837738410c06b481cd2222