Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 13:31:53 +0000 (15:31 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 6 Sep 2011 13:31:53 +0000 (15:31 +0200)
commit8ee3da5bba6bdfdee316e5eb1e7caf279524ea26
treea9fd3a3243a610b34bb11a35a696f7ba3798c448
parent7012e88090e69339c60a4eb9449f7a7e39ca6aa3
parent50a88396ae6d54a83a10e7d2efd551d39033148e
Merge branch 'master' into 0.11

Conflicts:
gst/playback/gstsubtitleoverlay.c
tests/check/elements/decodebin2.c
gst/playback/gstdecodebin2.c
gst/playback/gstplaybin2.c
gst/playback/gstsubtitleoverlay.c