r=rlk and r=neil, a=chofmann git-svn-id: svn://10.0.0.236/trunk@153912 18797224-902f-48f8-a5cc-f745e15eee43