Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 1 Jun 2011 17:47:10 +0000 (19:47 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 1 Jun 2011 17:47:10 +0000 (19:47 +0200)
commit272b3263aadd6ddc7fa49f162dd14a023bbd281c
treec497b87e4b54eb56431267321bfc0593ac301fe5
parent3f51563319320d3904333f933f7358d2a85fb3b9
parentc5ae6eed1000041bc294c95497da77c9dca080a0
Merge branch 'master' into 0.11

Conflicts:
plugins/elements/gstoutputselector.c
gst/gststructure.c
gst/gstvalue.c