[mscore/f12/master: 10/10] Merge branch 'master' into f12

[Orcan Ogetbil]

commit ec4e848c6cd32743450db8c4fddb766f6939f87b
Merge: 634f913 0f82425
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sat Oct 2 03:18:03 2010 -0400

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