Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 24 Aug 2011 08:43:09 +0000 (10:43 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 24 Aug 2011 08:43:09 +0000 (10:43 +0200)
Conflicts:
gst/gstobject.c

1  2 
gst/gstobject.c
libs/gst/base/gstbasesink.c

diff --cc gst/gstobject.c
Simple merge
Simple merge