merge trunk
authorKenichi Handa <handa@gnu.org>
Sat, 27 Apr 2013 13:35:45 +0000 (22:35 +0900)
committerKenichi Handa <handa@gnu.org>
Sat, 27 Apr 2013 13:35:45 +0000 (22:35 +0900)

Trivial merge