am 3decfe7d: (-s ours) am 330c1a06: Modify variables used in vCard code.

Merge commit '3decfe7d2785c4abc558f181d3abfe80c3d374af'

* commit '3decfe7d2785c4abc558f181d3abfe80c3d374af':
  Modify variables used in vCard code.