patch by kaie r=timeless sr=darin a=shaver git-svn-id: svn://10.0.0.236/trunk@174710 18797224-902f-48f8-a5cc-f745e15eee43