Merge commit 'a39f9188d6c1cdcacef2ab468fd78376171a3447' into eclair-plus-aosp * commit 'a39f9188d6c1cdcacef2ab468fd78376171a3447': Clean up vCard code.
Merge commit 'a39f9188d6c1cdcacef2ab468fd78376171a3447' into eclair-plus-aosp * commit 'a39f9188d6c1cdcacef2ab468fd78376171a3447': Clean up vCard code.