[xsynth-dssi/f12/master: 5/5] Merge branch 'master' into f12

[Orcan Ogetbil]

commit 7571e85ae81193aba1105c3bf769f68bd456f569
Merge: 9c66711 86530a5
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Sep 26 03:14:34 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore

 .gitignore                |    1 +
 sources                   |    2 +-
 xsynth-dssi-0.9.4-RELEASE |   10 ++++++++++
 xsynth-dssi.spec          |   25 +++++++++++++++++--------
 4 files changed, 29 insertions(+), 9 deletions(-)
---