Orange; merger with bf-blender.

(Merging is *not* fun work, especially not with bugfixes in main branch
for code that got cleaned up in the other! Poor Hos... :)

source/blender/src/editmesh_tools.c

@@ -377,7 +377,7 @@ int removedoublesflag(short flag, float limit)		/* return amount */
 	efa= em->faces.first;
 	while(efa) {
 		efa->f1= 0;
-		if(faceselectedAND(efa, 1)) {
+		if(faceselectedOR(efa, 1)) {
 			efa->f1= 1;
 			amount++;
 		}