[fluidsynth/f13/master: 4/4] Merge branch 'master' into f13

[Orcan Ogetbil]

commit f8e7904a0d91eefc30033a85ea573743806fb47b
Merge: d8728e3 8ee7b13
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sat Oct 2 01:08:23 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	fluidsynth.spec

 fluidsynth-diff-trunk-from-r371-to-r373.diff |   48 ++++++++++++++++++++++++++
 fluidsynth.spec                              |   10 ++++-
 2 files changed, 56 insertions(+), 2 deletions(-)
---