r584: merge of fix for KB828741 -- pw chg -- from 3.0