bug 110028, r=nhotta, sr=darin, a=shaver. git-svn-id: svn://10.0.0.236/trunk@116233 18797224-902f-48f8-a5cc-f745e15eee43
patch=william.tan@i-dns.net r=gordon sr=darin,brendan a=asa git-svn-id: svn://10.0.0.236/trunk@104649 18797224-902f-48f8-a5cc-f745e15eee43