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

[Orcan Ogetbil]

commit 80b52d1104f1de250bcefe68a06381df1511c3e2
Merge: a4d6c78 86530a5
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Sep 26 03:13:10 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

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