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

Merge from mainline.
---

9a0d7cf1aaffb76aaf4a94f5124795dd9d7c8aed