Thu, 13 May 2010 14:14:32 +0100 Merge from wip.
Daniel Jacobs <daniel.jacobs@nokia.com> [Thu, 13 May 2010 14:14:32 +0100] rev 553
Merge from wip.
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 tip