Sat, 31 Jul 2010 18:44:26 +0100 merge from SF
Tom Sutcliffe <thomas.sutcliffe@accenture.com> [Sat, 31 Jul 2010 18:44:26 +0100] rev 40
merge from SF
(0) -30 -10 -1 +1 +10 +30 tip