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)
commit5315723bbea1e7b65c3e5f3aed0ad716fa169d28
treea2f6cb12b284dfbfbd4f441a767bc0977b676084
parent81b14dd29dfa5db5b285bcbc3f72865004754200
parent770255e957e3881176087fa23c74c759ed56c1fa
merge trunk