patch by bc@bclary.com r=heikki sr=dbaron git-svn-id: svn://10.0.0.236/trunk@151352 18797224-902f-48f8-a5cc-f745e15eee43