patch by gary@radionics.com r=zach git-svn-id: svn://10.0.0.236/trunk@104561 18797224-902f-48f8-a5cc-f745e15eee43