From: Kenichi Handa <handa@etlken>
Date: Fri, 23 Apr 2010 02:17:09 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-23.1.97~19
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5315723bbea1e7b65c3e5f3aed0ad716fa169d28;p=emacs.git

merge trunk
---

5315723bbea1e7b65c3e5f3aed0ad716fa169d28