* Lots of build fixes due to a very bad commit with the merge not
[modest] / ChangeLog
1 * please check the svn log instead