[empathy: 3/4] Merge branch 'check-vinagre-589225'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 91085fbd03668468fa598e59e536c751478a57f5
Merge: 44b337d 6a40190
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Jun 21 14:19:00 2010 +0200

    Merge branch 'check-vinagre-589225'

 libempathy-gtk/empathy-contact-menu.c |    3 ++-
 libempathy/empathy-contact.c          |   12 +++++++++---
 libempathy/empathy-contact.h          |    4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)
---