am ff547a59: (-s ours) am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread

Merge commit 'ff547a59494206a1555eafa296b68961b677ba90'

* commit 'ff547a59494206a1555eafa296b68961b677ba90':
  Fix vCard so that it looks at IM correctly.