ENH: Changed xor to or for predicate merge operations.

git-svn-id: http://gpuocelot.googlecode.com/svn/trunk@2227 ec522b64-56cd-11de-8d7d-01d876f1962d