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

Merge from mainline.
---

cf206f28eb11467aed7f5e03f3e4df7724fd98d2