merge trunk
authorKenichi Handa <handa@gnu.org>
Sat, 28 Jun 2014 13:41:19 +0000 (22:41 +0900)
committerKenichi Handa <handa@gnu.org>
Sat, 28 Jun 2014 13:41:19 +0000 (22:41 +0900)
commit7ac67e08e52b7d4c292f17841084f316644ce195
tree7acbacdf0287f9812cd7ce8deee0d4040895aede
parentfda6144e04bb1621a7833e6b9c32701afb1563b6
parent01c442500fe3494226420cf776a8ba4134dda74e
merge trunk