Fix previous conflict.
authorKenichi Handa <handa@etlken>
Wed, 14 Jul 2010 03:53:53 +0000 (12:53 +0900)
committerKenichi Handa <handa@etlken>
Wed, 14 Jul 2010 03:53:53 +0000 (12:53 +0900)
commitebd3d6afa42948e3fb136583f12f9f72e7830ec5
tree5294a6d78466de1543250d2249920fb1c86376bb
parent73a4405a3539be595a6360c9e207d6ee2995a0c4
Fix previous conflict.
src/ChangeLog