From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 8 Jan 2010 20:59:09 +0000 (-0500)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~635^2~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f14e303adcecf25fa1f116c4040de08a9ed6231b;p=emacs.git

Merge from mainline.
---

f14e303adcecf25fa1f116c4040de08a9ed6231b