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

Merge from mainline.
---

3b8fb4b39271ee1abaa725fbda501e7f10a708c1