[totem-pl-parser: 3/3] Merge branch 'f15'

[Tomas Bzatek]

commit 21ab60f0e294401583498bd24bbe691b54bcfe34
Merge: e07135e 1eb345b
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Thu Apr 21 16:40:32 2011 +0200

    Merge branch 'f15'
    
    Conflicts:
    	.gitignore
    	sources
    	totem-pl-parser.spec

 .gitignore                                |    8 +-------
 0001-Fix-libquvi-version-dependency.patch |   26 --------------------------
 sources                                   |    2 +-
 totem-pl-parser.spec                      |    5 ++++-
 4 files changed, 6 insertions(+), 35 deletions(-)
---
diff --cc .gitignore
index ab72ac3,65c1222..a15da76
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,8 +1,1 @@@
--totem-pl-parser-2.30.1.tar.bz2
--/totem-pl-parser-2.30.3.tar.bz2
--/totem-pl-parser-2.31.92.tar.bz2
--/totem-pl-parser-2.32.0.tar.bz2
--/totem-pl-parser-2.32.1.tar.bz2
--/totem-pl-parser-2.32.2.tar.bz2
--/totem-pl-parser-2.32.3.tar.bz2
+ /totem-pl-parser-2.32.4.tar.bz2