more merging with the trunk

No match.