r=javi,sr=blizzard,a=choffman for trunk (also for 0.9.2, checked in) git-svn-id: svn://10.0.0.236/trunk@97828 18797224-902f-48f8-a5cc-f745e15eee43
r=javi,sr=blizzard,a=choffman for trunk (also for 0.9.2, checked in) git-svn-id: svn://10.0.0.236/trunk@97828 18797224-902f-48f8-a5cc-f745e15eee43