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

Merge from mainline.
---

d77fbdad04a1e3f8e4fa1038508379a5f5b8e67e