Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 19 Apr 2011 17:30:28 +0000 (19:30 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 19 Apr 2011 17:30:28 +0000 (19:30 +0200)
1  2 
gst/gstpad.c

diff --cc gst/gstpad.c
Simple merge