[whysynth-dssi/f13/master: 4/4] Merge branch 'master' into f13

[Orcan Ogetbil]

commit ab680af419796caa633472ac302db9bd4b3b1dc2
Merge: c86fc72 d3d7c07
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Sep 26 02:42:36 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .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