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

[Orcan Ogetbil]

commit d4a3aa2c4e9203c3938c5408f329da62381f03a9
Merge: 1c5f493 4009a35
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Mon Oct 11 22:52:04 2010 -0400

    Merge branch 'master' into f12

 .gitignore                                   |    1 +
 fluidsynth-diff-trunk-from-r371-to-r373.diff |   48 --------------------------
 fluidsynth.spec                              |   11 +++---
 sources                                      |    2 +-
 4 files changed, 7 insertions(+), 55 deletions(-)
---