merge trunk
authorKenichi Handa <handa@etlken>
Fri, 23 Apr 2010 02:17:09 +0000 (11:17 +0900)
committerKenichi Handa <handa@etlken>
Fri, 23 Apr 2010 02:17:09 +0000 (11:17 +0900)

Trivial merge