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

Merge frome mainline.
---

d23cd5eeb2993e55943d250ea8c2015da5b06a24