[fluidsynth/f12/master: 8/8] Merge branch 'master' into f12

[Orcan Ogetbil]

commit 1c5f493134af2fe1ffb2f69cba745dcc40e46a29
Merge: 38eaaea 8ee7b13
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sat Oct 2 01:09:21 2010 -0400

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

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