Merge remote-tracking branch 'origin/0.10'

Conflicts:
	bindings/python/Makefile.am
	ges/Makefile.am

diff --cc configure.ac
index 0694dac,9d1aa9b..6f7c0bc
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -145,8 -195,12 +145,12 @@@ dnl *** checks for headers **
  dnl *** checks for dependency libraries ***
  
  dnl GLib is required
 -AG_GST_GLIB_CHECK([2.22])
 +AG_GST_GLIB_CHECK([2.31.14])
  
+ PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, HAVE_GIO=yes, HAVE_GIO=no)
+ AC_SUBST(GIO_CFLAGS)
+ AC_SUBST(GIO_LIBS)
+ 
  dnl checks for gstreamer
  dnl uninstalled is selected preferentially -- see pkg-config(1)
  AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ], yes)

diff --cc ges/Makefile.am
index 0ee9ca9,1297322..c47a5ee
--- 1/ges/Makefile.am
--- 2/ges/Makefile.am
+++ b/ges/Makefile.am
@@@ -127,16 -143,17 +134,18 @@@ GES-@GST_MAJORMINOR@.gir: $(INTROSPECTI
                $(gir_cincludes) \
                -I$(top_srcdir) \
                -I$(top_builddir) \
 -              --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 -              --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.10` \
 +              --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.11` \
 +              --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.11` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gio-2.0` \
                --library=libges-@GST_MAJORMINOR@.la \
                --include=Gst-@GST_MAJORMINOR@ \
                --include=GstPbutils-@GST_MAJORMINOR@ \
                --libtool="$(top_builddir)/libtool" \
                --pkg gstreamer-@GST_MAJORMINOR@ \
                --pkg gstreamer-pbutils-@GST_MAJORMINOR@ \
+               --pkg gio-2.0 \
                --pkg-export ges-@GST_MAJORMINOR@ \
 +              --add-init-section="gst_init(NULL, NULL);" \
                --add-init-section="ges_init(NULL, NULL);" \
                --output $@ \
                $(gir_headers) \
@@@ -157,8 -174,9 +166,9 @@@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir
                --includedir=$(srcdir) \
                --includedir=$(srcdir)/../video \
                --includedir=$(builddir) \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 -              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.10` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.11` \
 +              --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-0.11` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gio-2.0` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)

diff --cc ges/ges-formatter.c
index 7860d53,41934cf..8577346
--- 1/ges/ges-formatter.c
--- 2/ges/ges-formatter.c
+++ b/ges/ges-formatter.c
@@@ -44,8 -44,10 +44,9 @@@
   **/
  
  #include <gst/gst.h>
+ #include <gio/gio.h>
  #include <stdlib.h>
  
 -#include "gesmarshal.h"
  #include "ges-formatter.h"
  #include "ges-keyfile-formatter.h"
  #include "ges-internal.h"