Updating to cvs head-V00-02-30
resolve the conflict due to cvs keywords
add the missing closing comment which was accidently removed
Merge pull request #166 from smuzaffar/merge-attempt

Merge attempt