This is a manual merge of branch drop split view intro trunk.
[modest] / src / maemo / pixmaps / modest-icon.png
src/maemo/pixmaps/modest-icon.png