merge trunk
authorKenichi Handa <handa@gnu.org>
Sun, 16 Sep 2012 16:18:23 +0000 (01:18 +0900)
committerKenichi Handa <handa@gnu.org>
Sun, 16 Sep 2012 16:18:23 +0000 (01:18 +0900)
commit0b97c030c678e7c77766e13e615ef2ce8394860a
treea13ca606850984cbe16de5ac89753e6bfdd957e3
parent85a43e2ea45592610c43a25468aabef921c709f8
parent1667e065d0720c65efc0c5385b9efb9f75b318c1
merge trunk