port changes in whiterussian ([3341]) to trunk.