merge trunk
authorKenichi Handa <handa@gnu.org>
Sun, 16 Sep 2012 16:18:23 +0000 (01:18 +0900)
committerKenichi Handa <handa@gnu.org>
Sun, 16 Sep 2012 16:18:23 +0000 (01:18 +0900)

Trivial merge