Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 7 Nov 2011 16:17:39 +0000 (17:17 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 7 Nov 2011 16:17:39 +0000 (17:17 +0100)
commitc9a403780528f4fad5ec41aff32616a4c3e32d7e
tree24ef19e99edb5f4d5307e5a07256c677fd62ff2f
parent24e596a1fbce1615a6c1b2b3c89e2b8f2a302e50
parent9121a30f9ab82d6d9e8474ee631ec4b2c2d5e716
Merge branch 'master' into 0.11

Conflicts:
gst/gstvalue.c
gst/gstcaps.c
gst/gststructure.c
gst/gstvalue.c