[glib/new-gsettings] merge back from master again

[Ryan Lortie <ryanl src gnome org>]

commit 461169ccfd07ea2ea4582a32a87bb0f59e92cc6e
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Apr 16 00:25:42 2010 -0400

    merge back from master again

 gio/gsettingsschema.c |    4 +---
 gio/gsettingsschema.h |    1 -
 2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
index 7ed0acf..188201d 100644
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.c
@@ -18,13 +18,11 @@
  */
 
 #include "config.h"
-#include <glib.h>
-#include <glibintl.h>
 
 #include "gsettingsschema.h"
-
 #include "gvdb/gvdb-reader.h"
 
+#include <glibintl.h>
 
 G_DEFINE_TYPE (GSettingsSchema, g_settings_schema, G_TYPE_OBJECT)
 
diff --git a/gio/gsettingsschema.h b/gio/gsettingsschema.h
index 0cf0086..a1a2d26 100644
--- a/gio/gsettingsschema.h
+++ b/gio/gsettingsschema.h
@@ -17,7 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-
 #ifndef __G_SETTINGS_SCHEMA_H__
 #define __G_SETTINGS_SCHEMA_H__