merge trunk
authorKenichi Handa <handa@etlken>
Mon, 9 Aug 2010 11:05:27 +0000 (20:05 +0900)
committerKenichi Handa <handa@etlken>
Mon, 9 Aug 2010 11:05:27 +0000 (20:05 +0900)

Trivial merge