merge trunk
authorKenichi Handa <handa@gnu.org>
Sun, 12 Jan 2014 23:26:08 +0000 (08:26 +0900)
committerKenichi Handa <handa@gnu.org>
Sun, 12 Jan 2014 23:26:08 +0000 (08:26 +0900)

Trivial merge