[mscore/f14/master: 3/3] Merge branch 'master' into f14

[Orcan Ogetbil]

commit 1a097f576094e423f9afa84015f27dd70d2768ae
Merge: 58dcf0c 0f82425
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sat Oct 2 02:45:46 2010 -0400

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

 .gitignore  |    3 +--
 mscore.spec |   11 +++++++----
 sources     |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index ef57ec7,6493d99..314e595
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--mscore-0.9.6.1-free.tar.bz2
--mscore-0.9.6.2-free.tar.bz2
 -/mscore-0.9.6.3-free.tar.bz2
++mscore-0.9.6.3-free.tar.bz2