Merge remote-tracking branch 'origin/0.10'
authorThibault Saunier <thibault.saunier@collabora.com>
Wed, 25 Apr 2012 21:53:38 +0000 (17:53 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Wed, 25 Apr 2012 21:54:36 +0000 (17:54 -0400)
commitb1a85962561d34e62bad9151629b1bcc1d0c7065
treead67a1040d897382b01cae9ab3c85c30810d36b1
parent4be360c4e5c12d3e91debf9e11a543281061a286
parent9e21741b901d12a4f7459310eec38d3afdca1bb5
Merge remote-tracking branch 'origin/0.10'

Conflicts:
bindings/python/ges-types.defs
bindings/python/ges.defs
bindings/python/ges.override
configure.ac
ges/ges-timeline.c
docs/libs/ges-sections.txt
ges/ges-timeline-layer.c
ges/ges-timeline-object.c
ges/ges-timeline-pipeline.c
ges/ges-timeline.c
ges/ges-track-object.c
ges/ges-track.c
tests/check/Makefile.am