Re: [boost] Spirit: suspicious unmerged changes