[gstreamer-rtsp/f14: 9/9] fix merge

[Peter Robinson]

commit b87433b365a9e57fa93d9f72f904a91f162951b0
Merge: 81673cc 84c58fb
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Aug 17 00:05:17 2011 +0100

    fix merge

 .gitignore             |    3 +-
 gst-rtsp-fixpygo.patch |   15 ++++++++++++++
 gstreamer-rtsp.spec    |   50 ++++++++++++++++++++++++++---------------------
 sources                |    2 +-
 4 files changed, 45 insertions(+), 25 deletions(-)
---
diff --cc .gitignore
index 13c5832,79ad429..912a4ea
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--gst-rtsp-0.10.5.tar.bz2
--/gst-rtsp-0.10.7.tar.bz2
 -/gst-rtsp-0.10.8.tar.bz2
++gst-rtsp-0.10.8.tar.bz2