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

Merge from mainline.
---

6e7d621c18f9645c886c0bb4fac69ec5c9c1fd12