[empathy: 4/4] Merge branch 'folks-async-and-prepare'

[Travis Reitter <treitter src gnome org>]

commit 34e8fc1344c5433be1a9d8f8614cdb84933a84fb
Merge: 4ca3b29 a976f81
Author: Travis Reitter <treitter gmail com>
Date:   Tue Jul 27 12:54:06 2010 +0200

    Merge branch 'folks-async-and-prepare'

 configure.ac                             |    2 +-
 libempathy-gtk/empathy-individual-view.c |   22 +++++++++++++++-
 libempathy/empathy-contact.c             |   19 +++++++++++++-
 libempathy/empathy-individual-manager.c  |   40 ++++++++++++++++++++++++++++-
 4 files changed, 77 insertions(+), 6 deletions(-)
---