Tue, 04 May 2010 12:11:13 +0100 merge from team wip wip
Richard Taylor <richard.i.taylor@nokia.com> [Tue, 04 May 2010 12:11:13 +0100] rev 508
merge from team wip
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 tip