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

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

Imported Upstream version 0.120.1+svn4142
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d519813341f34f07e356c02c613aca3c48473ca8
X-Git-Newrev: ea72e24b039d07859917676d1af65418da25cf24

The following commit has been merged in the master branch:
commit 7b4aca172b81aca16b9628cd99554fb559dc8e1e
Merge: d519813341f34f07e356c02c613aca3c48473ca8 1a0ad01cb5398617a9e41a0affdf5a1f85a20d1f
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Mar 3 14:05:50 2011 +0100

    Merge commit 'upstream/0.120.1+svn4142'


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