Merge remote-tracking branch 'origin/master' into 0.11
authorEdward Hervey <edward.hervey@collabora.co.uk>
Wed, 10 Aug 2011 15:07:54 +0000 (17:07 +0200)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Wed, 10 Aug 2011 15:07:54 +0000 (17:07 +0200)
commitbdc1710be5348b1275f0e301bf2495403b330ab0
tree59fc6167d5792e136c28b7fe3b782d09f08eea8d
parent178bdccb767cd063df2a373fdb73d706adef9bcd
parent20618b4c28accf4306de5766fd1628d8709b7af0
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
gst/gstdebugutils.c
gst/gstelementdetails.h
gst/gstregistrychunks.c
tools/gst-run.c
gst/gstdebugutils.c
gst/gstregistrychunks.c