[whysynth-dssi/f12/master: 6/6] Merge branch 'master' into f12

[Orcan Ogetbil]

commit b320bca56b24ab43bc33cb25ca4f8cdfa65c9449
Merge: 8668f51 d3d7c07
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Sep 26 02:44:35 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	sources
    	whysynth-dssi.spec

 .gitignore         |    2 +-
 sources            |    2 +-
 whysynth-dssi.spec |    9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index c4a2da0,9c79c1e..82e1814
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--whysynth-20090608.tar.bz2
 -/whysynth-20100922.tar.bz2
++whysynth-20100922.tar.bz2