patch by nsayer@kfu.com r=darin sr=darin git-svn-id: svn://10.0.0.236/trunk@153414 18797224-902f-48f8-a5cc-f745e15eee43