--- /usr/lib/portage/pym/portage.py.orig	2006-08-19 22:57:16.267793250 -0400
+++ /usr/lib/portage/pym/portage.py.orig	2006-08-19 22:58:00.054529750 -0400
@@ -6615,11 +6615,6 @@ 
 								moveme=1
 								cfgfiledict[myrealdest]=[mymd5]
 								cfgprot=1
-							elif cfgfiledict.has_key(myrealdest) and (mymd5 in cfgfiledict[myrealdest]):
-								#myd5!=destmd5, we haven't cycled, and the file we're merging has been already merged previously
-								zing="-o-"
-								moveme=cfgfiledict["IGNORE"]
-								cfgprot=cfgfiledict["IGNORE"]
 							else:
 								#mymd5!=destmd5, we haven't cycled, and the file we're merging hasn't been merged before
 								moveme=1