follow up r1029 at SVN

sorry for late sync