fix merge
[roobuilder] / ChangeLog