Merge commit '0100fae14ff12c36eeff07b94cdea5f8756837aa' into eclair-plus-aosp * commit '0100fae14ff12c36eeff07b94cdea5f8756837aa': Make ContactStruct handle Collection properly.
Merge commit '0100fae14ff12c36eeff07b94cdea5f8756837aa' into eclair-plus-aosp * commit '0100fae14ff12c36eeff07b94cdea5f8756837aa': Make ContactStruct handle Collection properly.