Merge commit 'eb114de5037bba89333bd7d57d305ae989727096' into eclair-mr2-plus-aosp * commit 'eb114de5037bba89333bd7d57d305ae989727096': Make vCard exporter append neighborhood to locality field instead of extended address,