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

Merge from mainline.
---

2db38a6f98c2abb42b746064ce97417cccc27e68