[SCM] jack-audio-connection-kit/master: Merge commit 'upstream/0.118+svn4089'

[adiknoth-guest at users.alioth.debian.org]

Imported Upstream version 0.118+svn4089
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 36196e2ce80f6c292e68c87b6a01c4d5e0678164
X-Git-Newrev: 9507f1d00028926cc16cbdd4f7884b311c1dbbd4

The following commit has been merged in the master branch:
commit 1ed46f28c3d88e1b9b4347bbeab772a7ad86e518
Merge: 25f1b718891462242f615579956ff7eacf17721b f4e1d2375ae166cd709ea79af6f835a7fab46707
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Nov 23 15:45:59 2010 +0100

    Merge commit 'upstream/0.118+svn4089'


-- 
Debian packaging for jack-audio-connection-kit