[clementine/f14/master: 6/6] Merge branch 'master' into f14

[Orcan Ogetbil]

commit 3b96dff3c89b84a2d2a666ba98dd91486b3ce28a
Merge: 734c94c 9bfeed7
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Wed Sep 29 18:31:22 2010 -0400

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	clementine.spec
    	sources

 .gitignore      |    3 +--
 clementine.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 4f68349,1540219..9c510ac
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--clementine-0.4.2.tar.gz
--/clementine-0.5.2.tar.gz
 -/clementine-0.5.3.tar.gz
++clementine-0.5.3.tar.gz