Merge commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb' into eclair-plus-aosp * commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb': Two changes toward vCard composer.
Merge commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb' into eclair-plus-aosp * commit '3ed05574e363fedb40a99b9b2f2d4da40f3c42bb': Two changes toward vCard composer.