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)
commit6f295dc2390d850ca321ccf78ddf4392d4c4bce9
treee0a8d7cbe7f18d103467196ee3ee6b76eee9a991
parent655f1b9c579120a4e912b4f98e5b6c3d5edae97b
parentc1988b7e55da4b4feea2c38b3b3e95116ee3b2f5
Merge branch 'master' into 0.11

Conflicts:
gst/gstobject.c
gst/gstobject.c
libs/gst/base/gstbasesink.c