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

Merge from mainline.
---

1db6ebe40405dec23b51eb8015c58be0bc46fe13