[boost] status of trunk and merging in changes