whoops, de-conflictify
whoops, de-conflictify

Original commit message from CVS:
whoops, de-conflictify

lovebug356/gstreamer,surround-io/gstreamer,lovebug356/gstreamer,ahmedammar/platform_external_gst_gstreamer,centricular/gstreamer,collects/gstreamer,cfoch/gstreamer,Lachann/gstreamer,magcius/gstreamer,krieger-od/gstreamer,cfoch/gstreamer,jpakkane/gstreamer,mparis/gstreamer,ensonic/gstreamer,drothlis/gstreamer,krieger-od/gstreamer,mrchapp/gstreamer,cfoch/gstreamer,krichter722/gstreamer,ylatuya/gstreamer,shelsonjava/gstreamer,Lachann/gstreamer,shelsonjava/gstreamer,ensonic/gstreamer,jpakkane/gstreamer,jpxiong/gstreamer,jpxiong/gstreamer,jpakkane/gstreamer,cablelabs/gstreamer,cfoch/gstreamer,jpakkane/gstreamer,justinjoy/gstreamer,drothlis/gstreamer,krieger-od/gstreamer,justinjoy/gstreamer,surround-io/gstreamer,jpakkane/gstreamer,ylatuya/gstreamer,lubosz/gstreamer,krichter722/gstreamer,mrchapp/gstreamer,ahmedammar/platform_external_gst_gstreamer,ylatuya/gstreamer,StreamUtils/gstreamer,Distrotech/gstreamer,Lachann/gstreamer,shelsonjava/gstreamer,surround-io/gstreamer,collects/gstreamer,magcius/gstreamer,ahmedammar/platform_external_gst_gstreamer,collects/gstreamer,justinjoy/gstreamer,centricular/gstreamer,lovebug356/gstreamer,drothlis/gstreamer,drothlis/gstreamer,krieger-od/gstreamer,mparis/gstreamer,centricular/gstreamer,ensonic/gstreamer,ylatuya/gstreamer,cablelabs/gstreamer,mrchapp/gstreamer,drothlis/gstreamer,mparis/gstreamer,centricular/gstreamer,shelsonjava/gstreamer,krichter722/gstreamer,justinjoy/gstreamer,magcius/gstreamer,magcius/gstreamer,cfoch/gstreamer,collects/gstreamer,lovebug356/gstreamer,jpxiong/gstreamer,surround-io/gstreamer,Lachann/gstreamer,lubosz/gstreamer,Distrotech/gstreamer,StreamUtils/gstreamer,Distrotech/gstreamer,ahmedammar/platform_external_gst_gstreamer,krichter722/gstreamer,lovebug356/gstreamer,shelsonjava/gstreamer,ylatuya/gstreamer,cablelabs/gstreamer,ensonic/gstreamer,cablelabs/gstreamer,centricular/gstreamer,surround-io/gstreamer,lubosz/gstreamer,Lachann/gstreamer,StreamUtils/gstreamer,collects/gstreamer,mrchapp/gstreamer,Distrotech/gstreamer,krieger-od/gstreamer,mrchapp/gstreamer,StreamUtils/gstreamer,cablelabs/gstreamer,magcius/gstreamer,mparis/gstreamer,ahmedammar/platform_external_gst_gstreamer,lubosz/gstreamer,StreamUtils/gstreamer,jpxiong/gstreamer,jpxiong/gstreamer,krichter722/gstreamer,Distrotech/gstreamer,lubosz/gstreamer,mparis/gstreamer,ensonic/gstreamer,justinjoy/gstreamer