Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Jul 2011 09:10:39 +0000 (11:10 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 7 Jul 2011 09:10:39 +0000 (11:10 +0200)
commit26cc33cb629db74d59cd077ffce439dff492f6ca
tree9a4d7655c04f4638958df0a2a0e728ed5e25272a
parent43bee0022a2bff2ce80fb71b613b0549d1085bf0
parentbf816fe81624d31a68d48bba1c48a969cee399f4
Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/tag/gstxmptag.c
gst/encoding/gststreamsplitter.c
gst-libs/gst/tag/gstxmptag.c
gst/encoding/gstencodebin.c
gst/encoding/gststreamsplitter.c
gst/typefind/gsttypefindfunctions.c
tests/check/libs/tag.c