[empathy: 5/5] Merge branch 'debugger'

[Jonny Lamb <jonnylamb src gnome org>]

commit 2f64117b60d24ba5ad3f4bb1c41d4ea3a91f15a6
Merge: aa9603b... 807b622...
Author: Jonny Lamb <jonny lamb collabora co uk>
Date:   Thu Jun 25 18:52:48 2009 +0100

    Merge branch 'debugger'

 libempathy/Makefile.am        |    3 +
 libempathy/empathy-debug.c    |   76 ++++++++++--
 libempathy/empathy-debug.h    |    6 +-
 libempathy/empathy-debugger.c |  270 +++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-debugger.h |   88 +++++++++++++
 src/Makefile.am               |    1 +
 src/empathy-debug-dialog.c    |   12 ++-
 src/empathy.c                 |   31 +++++
 8 files changed, 475 insertions(+), 12 deletions(-)
---