Wed, 23 Jun 2010 17:21:36 +0100 Merge heads.
Pat Downey <patd@symbian.org> [Wed, 23 Jun 2010 17:21:36 +0100] rev 7
Merge heads.
(0) -1 +1 +10 tip