[empathy: 2/2] Merge commit 'ksz/can_stream_tube'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 35a5ce7c4708114932b9e0274925f6a34efd2895
Merge: a585fb5... ce67f69...
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Jun 1 15:47:55 2009 +0100

    Merge commit 'ksz/can_stream_tube'

 libempathy/empathy-contact.c            |   12 ++++++
 libempathy/empathy-contact.h            |    2 +
 libempathy/empathy-tp-contact-factory.c |   67 +++++++++++++++++++------------
 3 files changed, 55 insertions(+), 26 deletions(-)