[SCM] fluidsynth/master: Merge commit 'upstream/1.1.4'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.1.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 23f4b9d48505c38ae1cfbb0d7a091be619327af6
X-Git-Newrev: 9fd91d4b3bb1ac14365dff81a8303dda9279f9ea

The following commit has been merged in the master branch:
commit 9fd91d4b3bb1ac14365dff81a8303dda9279f9ea
Merge: 23f4b9d48505c38ae1cfbb0d7a091be619327af6 9e58eeccc683162662f413356d38d24af8743abd
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Aug 5 09:33:54 2011 +0200

    Merge commit 'upstream/1.1.4'


-- 
fluidsynth packaging