TSW ID: SHUI-6P275Z Will be checked in 3.1 branch and main trunk.
Created attachment 10798 [details] Patch for 3.1m
Created attachment 10799 [details] Patch for main trunk.
Comment on attachment 10798 [details] Patch for 3.1m r=me
committed as r16638
verified and closed.