From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 20 Mar 2010 11:14:01 +0000 (-0400)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~635^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f2cdb04ac04fb8f9f92bce11df6e4a020720208b;p=emacs.git

Merge from mainline.
---

f2cdb04ac04fb8f9f92bce11df6e4a020720208b