patch by ajschult@verizon.net r=chase git-svn-id: svn://10.0.0.236/trunk@172603 18797224-902f-48f8-a5cc-f745e15eee43