[empathy: 10/10] Merge branch 'tp-tube'

[Guillaume Desmottes <gdesmott src gnome org>]

commit ebfb5e83604b4a48482e3126e5797f05ff99b3b1
Merge: 0f26849... 265700b...
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Apr 27 11:16:38 2009 +0100

    Merge branch 'tp-tube'

 libempathy/empathy-tp-tube.c      |  304 +++++++++++++++++++++++++++++++++----
 libempathy/empathy-tp-tube.h      |   27 +++-
 libempathy/empathy-tube-handler.c |   35 ++++-
 3 files changed, 323 insertions(+), 43 deletions(-)