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)
commitaa151b90b64cc6861629c505badc7d766586b288
tree207f08cf2c9821fdbf1e77381756898896b01288
parent82a9ce0fbe7d4e0646fe9d2888f312fa4a39c74b
parent8ea90aa3525a93194e98b7e1b2ea77e96ca3dde6
merge trunk