From: Kenichi Handa <handa@etlken>
Date: Fri, 14 May 2010 07:29:06 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~210
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c2eb4a8321dd86f085724c709e881663c81d0c6b;p=emacs.git

merge trunk
---

c2eb4a8321dd86f085724c709e881663c81d0c6b