merge trunk
authorKenichi Handa <handa@gnu.org>
Mon, 8 Jul 2013 11:55:58 +0000 (20:55 +0900)
committerKenichi Handa <handa@gnu.org>
Mon, 8 Jul 2013 11:55:58 +0000 (20:55 +0900)

Trivial merge