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)

Trivial merge