[clementine/f13/master: 9/9] Merge branch 'master' into f13

[Orcan Ogetbil]

commit 0fb58ee6ea603be3ff45012fee2fba9c5a28463c
Merge: f12ef26 9bfeed7
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Wed Sep 29 18:32:40 2010 -0400

    Merge branch 'master' into f13
    
    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