[empathy: 7/7] Merge branch 'chooser-662250'

[Danielle Madeley <daniellem src gnome org>]

commit d4b219993118e76fdf25a609839e1c334e26182f
Merge: ebd34b4 e2bf0b6
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Fri Oct 21 09:32:08 2011 +1100

    Merge branch 'chooser-662250'

 libempathy-gtk/Makefile.am                        |    3 -
 libempathy-gtk/empathy-contact-chooser.c          |   74 +++-
 libempathy-gtk/empathy-contact-selector-dialog.c  |  600 ---------------------
 libempathy-gtk/empathy-contact-selector-dialog.h  |   96 ----
 libempathy-gtk/empathy-contact-selector-dialog.ui |   52 --
 libempathy-gtk/empathy-new-call-dialog.c          |    3 +-
 libempathy-gtk/empathy-new-message-dialog.c       |   11 +-
 7 files changed, 80 insertions(+), 759 deletions(-)
---