[empathy: 9/9] Merge remote branch 'sjoerd/misc'

[Danielle Madeley <daniellem src gnome org>]

commit 44b337df1962dbcda7b8de161444735570d38972
Merge: 783c15a 733ae44
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Mon Jun 21 19:33:42 2010 +1000

    Merge remote branch 'sjoerd/misc'

 configure.ac                                |   31 -----------------------
 libempathy-gtk/empathy-chat.c               |   16 ++++++------
 libempathy-gtk/empathy-chat.h               |    3 +-
 libempathy-gtk/empathy-contact-list-store.c |   19 +++++++-------
 libempathy-gtk/empathy-contact-menu.c       |    4 ---
 libempathy-gtk/empathy-contact-widget.c     |    8 ------
 libempathy/empathy-contact-list.c           |    6 ----
 libempathy/empathy-dispatch-operation.c     |   35 +++++++++++---------------
 8 files changed, 34 insertions(+), 88 deletions(-)
---