Merge change Iddaa2885 into eclair

* changes:
  b/2158629 Fixed the problem where inviting attendees with pretty display names do not work e.g. "Silly Mike" <mike@mike.com>.
diff --git a/src/com/android/calendar/EmailAddressAdapter.java b/src/com/android/calendar/EmailAddressAdapter.java
index 4679960..bfcb986 100644
--- a/src/com/android/calendar/EmailAddressAdapter.java
+++ b/src/com/android/calendar/EmailAddressAdapter.java
@@ -59,7 +59,7 @@
         String name = cursor.getString(NAME_INDEX);
         String address = cursor.getString(DATA_INDEX);
 
-        return new Rfc822Token(address, name, null).toString();
+        return new Rfc822Token(name, address, null).toString();
     }
 
     @Override