Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Jun 2011 10:14:57 +0000 (12:14 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 10 Jun 2011 10:14:57 +0000 (12:14 +0200)
commit0ac9bb7d99c36584eff96520ebab23541c412d1a
treee162fd4cd67107edfc950af6855bf9812a104e59
parentdb999572a87b5872a95240bd21ac2c7f1b5d2410
parentefdd32580e887aeb68108d9578c0388bbc373375
Merge branch 'master' into 0.11

Conflicts:
tests/examples/audio/Makefile.am
tests/examples/v4l/Makefile.am
ext/pango/Makefile.am
gst-libs/gst/tag/gstvorbistag.c
gst-libs/gst/tag/gstxmptag.c
gst-libs/gst/tag/tag.h
tests/examples/audio/Makefile.am