From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 25 Jan 2010 17:42:44 +0000 (-0500)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~635^2~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=639dd35751e5d43072ef14bc679286136a4feae9;p=emacs.git

Merge from mainline.
---

639dd35751e5d43072ef14bc679286136a4feae9