Wed, 28 Jul 2010 18:43:53 +0100 merge from SF
Tom Sutcliffe <thomas.sutcliffe@accenture.com> [Wed, 28 Jul 2010 18:43:53 +0100] rev 12
merge from SF
(0) -10 -1 +1 +10 +30 tip