Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 22 Aug 2011 10:33:35 +0000 (12:33 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 22 Aug 2011 10:33:35 +0000 (12:33 +0200)
commit8170c34c943e83c7fdef30394bbbff09418a2e6c
tree8f699b96a5988284fa7d7af08e30e0b46bc7cc66
parent405a5d2a925ff9fbe582ad70ed4b6ed90e3f5b15
parentec6e452f6314b10e883c6f95366867a02c775ff0
Merge branch 'master' into 0.11

Conflicts:
gst/gstbuffer.h
gst/gstcaps.c
gst/gstcaps.h
gst/gstevent.c
gst/gst.c
gst/gstbuffer.h
gst/gstcaps.c
gst/gstdebugutils.c
gst/gstelement.c
gst/gstelement.h
gst/gstelementfactory.c
gst/gstevent.c
gst/gstobject.c
libs/gst/base/gstbaseparse.c