am a7bb3ba5: (-s ours) am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread

Merge commit 'a7bb3ba54aed70919c8304ae4227ab5106243f75'

* commit 'a7bb3ba54aed70919c8304ae4227ab5106243f75':
  Make vCard importer/exporter aware of multi-byte parameters.