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

Merge from mainline.
---

6eca625b774a4bdc782e8b878c8cf05663742101