Merge change 26813 into eclair

* changes:
  Compare rawContactIds using actual number value.
diff --git a/src/com/android/contacts/model/EntitySet.java b/src/com/android/contacts/model/EntitySet.java
index 02a127e..2137987 100644
--- a/src/com/android/contacts/model/EntitySet.java
+++ b/src/com/android/contacts/model/EntitySet.java
@@ -216,7 +216,7 @@
         final int size = this.size();
         for (int i = 0; i < size; i++) {
             final Long currentId = getRawContactId(i);
-            if (currentId == rawContactId) {
+            if (rawContactId.equals(currentId)) {
                 return i;
             }
         }