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

Merge from mainline.
---

0a762a3a21b8d1053751968200331e1a87e2ad22