[empathy: 3/3] Merge commit 'elliot/bug-584703-c'

[Xavier Claessens <xclaesse src gnome org>]

commit 5e30d8dcf1b80b6281df6bd872bb4455f28c1b23
Merge: 8ffe9c1... 240b54d...
Author: Xavier Claessens <xclaesse gmail com>
Date:   Sun Jun 28 09:58:53 2009 +0200

    Merge commit 'elliot/bug-584703-c'

 libempathy/empathy-account-manager.c |   14 ++++++++++
 libempathy/empathy-contact-manager.c |   44 ++++++++++++++++++---------------
 2 files changed, 38 insertions(+), 20 deletions(-)
---