commited merge from trunk revision 5445
[modest] / modest.git
2006-04-28 Jose Dapena PazInitial commit