Merge branch 'master' into 0.11-fdo
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 30 Mar 2011 18:23:54 +0000 (20:23 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 30 Mar 2011 18:23:54 +0000 (20:23 +0200)
commitadaf08f1433888ac7a93e6703639f44aa66f2901
tree13a5e3f47b9a50901a4c6bcb9a601ea117931ff2
parent248ab2d0643b64f98fe173a37a22cd78340e661e
parent2e220e352fe467234bb0937b6078f007ef9b6c07
Merge branch 'master' into 0.11-fdo

Conflicts:
gst-libs/gst/tag/gstxmptag.c
gst-libs/gst/tag/Makefile.am
gst-libs/gst/tag/gstxmptag.c
gst-libs/gst/tag/tag.h
gst/typefind/gsttypefindfunctions.c
tests/check/gst/typefindfunctions.c
win32/common/libgsttag.def