[empathy: 3/3] Merge branch 'contact'

[Xavier Claessens <xclaesse src gnome org>]

commit 4ec913aeb99b71c85da47e47490954a22465babc
Merge: 23bfa8e e4337e5
Author: Xavier Claessens <xclaesse gmail com>
Date:   Wed Jan 13 11:59:24 2010 +0100

    Merge branch 'contact'

 libempathy-gtk/empathy-contact-dialogs.c   |    1 +
 libempathy-gtk/empathy-contact-list-view.c |    2 +
 libempathy-gtk/empathy-contact-widget.c    | 1774 ++++++++++++++--------------
 libempathy-gtk/empathy-contact-widget.ui   |  194 ++--
 4 files changed, 947 insertions(+), 1024 deletions(-)
---