patch by Morten@Nilsen.com r=hwaara sr=alecf git-svn-id: svn://10.0.0.236/trunk@156908 18797224-902f-48f8-a5cc-f745e15eee43