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

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

Imported Upstream version 0.118+svn4104
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7b848237aa498bff2f317a53a6a133faf5661b6f
X-Git-Newrev: c00b875b5805b8aa9c379157049249c51ea8dfbd

The following commit has been merged in the master branch:
commit 43c1657e9b3e8ffb9294fdea2b1b9cda854eec0d
Merge: 69ef82e8c318db9ae6da3a4f27f1d99eb68ddac2 ee04366c5cbde7f1ff12cb3890164493fe4b3adc
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed Jan 12 17:28:07 2011 +0100

    Merge commit 'upstream/0.118+svn4104'


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