patch v4: check both old and new canonical form r=mmchew git-svn-id: svn://10.0.0.236/trunk@215722 18797224-902f-48f8-a5cc-f745e15eee43
patch v4: check both old and new canonical form r=mmchew git-svn-id: svn://10.0.0.236/trunk@215722 18797224-902f-48f8-a5cc-f745e15eee43