remove a cvs merge leftover
remove a cvs merge leftover

Original commit message from CVS:
remove a cvs merge leftover

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