[empathy: 2/2] Merge branch 'butterfly-networkid'

[Jonny Lamb <jonnylamb src gnome org>]

commit df53944e1ba92732760d1cfe437b8b56edda526b
Merge: ba8f9b6 c448b89
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Mon Mar 15 08:09:56 2010 +0000

    Merge branch 'butterfly-networkid'

 data/empathy.schemas.in                |   14 ++
 libempathy-gtk/empathy-conf.h          |    1 +
 libempathy/empathy-log-store-empathy.c |    7 +
 libempathy/empathy-log-store-empathy.h |    5 +
 src/Makefile.am                        |    1 +
 src/empathy-main-window.c              |   18 +++
 src/empathy-migrate-butterfly-logs.c   |  213 ++++++++++++++++++++++++++++++++
 src/empathy-migrate-butterfly-logs.h   |   32 +++++
 8 files changed, 291 insertions(+), 0 deletions(-)
---