[empathy: 4/4] Merge branch 'stable-block-645504'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 5316d721a24d2c1c2496f751a4cf139d88e274c1
Merge: e5bfa46 f357bd6
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Mar 22 14:54:32 2011 +0100

    Merge branch 'stable-block-645504'

 configure.ac                                       |    2 +-
 .../Connection_Interface_Contact_Blocking.xml      |  172 --------------------
 extensions/Makefile.am                             |    1 -
 extensions/misc.xml                                |    1 -
 libempathy/empathy-tp-contact-list.c               |   12 +-
 5 files changed, 7 insertions(+), 181 deletions(-)
---