[empathy: 2/2] Merge remote branch 'pwith/634754-folks-api-changes'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 5d15b2ed1f68d17364a53549ceb503275c62769d
Merge: cb0e2e0 ff49ee8
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Nov 15 10:54:18 2010 +0100

    Merge remote branch 'pwith/634754-folks-api-changes'

 .../empathy-individual-information-dialog.c        |    2 +-
 libempathy-gtk/empathy-individual-store.c          |   42 ++++++++++---------
 libempathy-gtk/empathy-individual-view.c           |    6 +-
 libempathy-gtk/empathy-linking-dialog.c            |    2 +-
 libempathy-gtk/empathy-ui-utils.c                  |    3 +-
 libempathy/empathy-individual-manager.c            |    2 +-
 6 files changed, 30 insertions(+), 27 deletions(-)
---