* Lots of build fixes due to a very bad commit with the merge not
[modest] / modest.git
1 modest.git