* fix some of the fallout of the last commit
[modest] / modest.git
1 modest.git