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

Merge from mainline.
---

9565d1e6f3d09d5cd5afebd1b30a7571a27199cc