From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 23 Jan 2010 08:49:15 +0000 (-0500)
Subject: Merger from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~635^2~24
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=151b77c2684759f6f883c012ce8469b68741b6eb;p=emacs.git

Merger from mainline.
---

151b77c2684759f6f883c012ce8469b68741b6eb