Merge branch '0.10'

Conflicts:
	bindings/python/ges.defs

diff --cc docs/libs/ges-sections.txt
Simple merge

diff --cc ges/ges-timeline-layer.c
Simple merge

diff --cc ges/ges-timeline-object.c
index 8f5d988,896ddcd..6f25826
--- 1/ges/ges-timeline-object.c
--- 2/ges/ges-timeline-object.c
+++ b/ges/ges-timeline-object.c
@@@ -370,9 -381,21 +382,21 @@@ ges_timeline_object_class_init (GESTime
     */
    ges_timeline_object_signals[TRACK_OBJECT_REMOVED] =
        g_signal_new ("track-object-removed", G_TYPE_FROM_CLASS (klass),
 -      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, ges_marshal_VOID__OBJECT,
 +      G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_generic,
        G_TYPE_NONE, 1, GES_TYPE_TRACK_OBJECT);
  
+   /**
+    * GESTimelineObject:max-duration:
+    *
+    * The maximum duration (in nanoseconds) of the #GESTimelineObject.
+    *
+    * Since: 0.10.XX
+    */
+   g_object_class_install_property (object_class, PROP_MAX_DURATION,
+       g_param_spec_uint64 ("max-duration", "Maximum duration",
+           "The duration of the object", 0, G_MAXUINT64, G_MAXUINT64,
+           G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+ 
    klass->need_fill_track = TRUE;
  }
  

diff --cc ges/ges-timeline.c
Simple merge

diff --cc ges/ges-track-object.c
Simple merge

diff --cc tests/check/ges/save_and_load.c
Simple merge