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

Merge from mainline.
---

36447e8d1f292611ce4db90e8fda8f3e25333747