[empathy] Fixes from merging master

[Travis Reitter <treitter src gnome org>]

commit e53b7431a34c09ceed319a1680cde1e44a50dab2
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Wed Jun 23 16:46:26 2010 +0100

    Fixes from merging master

 src/empathy-main-window.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 0e596fe..0af2413 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -42,6 +42,7 @@
 #include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-individual-manager.h>
+#include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-status-presets.h>
 #include <libempathy/empathy-tp-contact-factory.h>