From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 28 Mar 2010 13:04:11 +0000 (-0400)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~635^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7dbdb6dfc3ffdc25f8d32a43683500f596d9784;p=emacs.git

Merge from mainline.
---

e7dbdb6dfc3ffdc25f8d32a43683500f596d9784