Merge commit 'b55e60e1d88c02078c3d6bc0f408fb0065a1e93c' into eclair-plus-aosp * commit 'b55e60e1d88c02078c3d6bc0f408fb0065a1e93c': Fix vCard code.