Patch by Chris Yeh <Chris.Yeh@nokia.com> r= justdave@syndicomm.com git-svn-id: svn://10.0.0.236/trunk@96172 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@92901 18797224-902f-48f8-a5cc-f745e15eee43