2010-10-11 Merge.
Johan Groth <johang@symbian.org> [Mon, 11 Oct 2010 14:51:10 +0100] rev 1266
Merge.
(0) -1000 -300 -100 -30 -10 -1 +1 +10 tip