Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 18 May 2011 11:14:57 +0000 (13:14 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 18 May 2011 11:14:57 +0000 (13:14 +0200)
commite39182a08580e723093c478017650889b5e9a0f4
tree0fa4137d8997dbaf5768b77506c04fa9c7114fe4
parent4c582b010b621414e785a70fa1a8b241cd2c68b2
parent51fc15e99d80dd5d39bf00b6d69923a6f9ff14a9
Merge branch 'master' into 0.11

Conflicts:
gst/gstminiobject.c
gst/gstpad.c
gst/gstpad.h
gst/gstplugin.h
libs/gst/base/gstbaseparse.c
gst/gst_private.h
gst/gstpad.c
gst/gstpad.h
gst/gstregistry.c
gst/gstregistrychunks.c
libs/gst/base/gstbaseparse.c
tools/gst-inspect.c