patch by alexey@ihug.com.au r=ftang sr=heikki git-svn-id: svn://10.0.0.236/trunk@136613 18797224-902f-48f8-a5cc-f745e15eee43