[empathy: 5/5] Merge branch 'people-nearby-fake-group-613558'

[Danielle Madeley <daniellem src gnome org>]

commit 940d0e9778828657a6ffbcadd35a8a84d706ac70
Merge: e7f7047 fff7680
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Tue Mar 30 21:37:25 2010 +1100

    Merge branch 'people-nearby-fake-group-613558'

 libempathy-gtk/empathy-contact-list-store.c |   78 +++++++++++++++++++++++----
 libempathy-gtk/empathy-contact-list-store.h |    1 +
 libempathy-gtk/empathy-contact-list-view.c  |   13 +++--
 libempathy/empathy-tp-contact-list.c        |   19 -------
 4 files changed, 76 insertions(+), 35 deletions(-)
---