[fluidsynth/f14/master: 3/3] Merge branch 'master' into f14

[Orcan Ogetbil]

commit ff349b1b558befa76a6059e4306862f5cbabaa94
Merge: 4eac1e8 8ee7b13
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sat Oct 2 01:06:58 2010 -0400

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

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