This is a manual merge of branch drop split view intro trunk.
[modest] / ChangeLog
1 * please check the svn log instead