From: Kenichi Handa <handa@m17n.org>
Date: Fri, 17 Sep 2010 05:07:47 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~4060
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=005cbf40d539d48665d7c37d5b09dca280b81c32;p=emacs.git

merge trunk
---

005cbf40d539d48665d7c37d5b09dca280b81c32