[empathy: 3/3] Merge commit 'origin/master'

[Davyd Madeley <davyd src gnome org>]

commit d151261308da99f44410da4f07b78dd56c0cb5f8
Merge: 395a0ea... 545342a...
Author: Davyd Madeley <davyd madeley id au>
Date:   Thu May 28 17:54:30 2009 +0800

    Merge commit 'origin/master'

 configure.ac                            |    2 +-
 extensions/Channel_Interface_Tube.xml   |  148 -----------------
 extensions/Channel_Type_DBus_Tube.xml   |  163 -------------------
 extensions/Channel_Type_Stream_Tube.xml |  262 -------------------------------
 extensions/Makefile.am                  |    5 +-
 extensions/misc.xml                     |    3 -
 libempathy/empathy-tp-tube.c            |   27 ++--
 src/empathy-event-manager.c             |    4 +-
 src/empathy-tube-dispatch.c             |    8 +-
 9 files changed, 21 insertions(+), 601 deletions(-)