patch=doron, r=heikki, sr=darin git-svn-id: svn://10.0.0.236/trunk@154039 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@102948 18797224-902f-48f8-a5cc-f745e15eee43