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

Merge from mainline.
---

565cbcc3282217eea840141a424c692f68093f8e