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

Merge from upstream.
---

a179af9bd20b2e9968506003937a152c1cbb5d9e