r=dougt, r=av (plugin stuff) sr=jag git-svn-id: svn://10.0.0.236/trunk@123228 18797224-902f-48f8-a5cc-f745e15eee43