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

Merge from mainline.
---

c4810d2f26b64517c8fefe9e30b296ca41e3f8bc