Only try to merge portage asap when the new version is different. (trunk r15813)

svn path=/main/branches/2.1.7/; revision=15814
1 file changed