Merged the change of elmo-mark branch at 2003-08-30.