[kmplayer/f12/master: 8/8] Merge branch 'master' into f12

[Orcan Ogetbil]

commit 636a756bd44f602763b6fb7da66ca7a65c1a015c
Merge: 96de4e2 41379d2
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Tue Oct 5 18:21:23 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	kmplayer-no-xtest.patch
    	kmplayer.spec
    	sources

 .gitignore              |    2 +-
 kmplayer-no-xtest.patch |   10 ----------
 kmplayer.spec           |    5 ++++-
 sources                 |    2 +-
 4 files changed, 6 insertions(+), 13 deletions(-)
---
diff --cc .gitignore
index a05f1a0,255b6a6..636bd2a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--kmplayer-0.11.2b.tar.bz2
+ /kmplayer-0.11.2c.tar.bz2