[SCM] jack-audio-connection-kit/master: Merge branch 'upstream'

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

Imported Upstream version 0.121.3+20120222git81e8f031
Imported Upstream version 0.121.0+svn4538
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4e798d46ea2f66f105260bf796f2c334efca03af
X-Git-Newrev: 031e1dd196333fdd94b127dc97c67b11aeb68bf3

The following commit has been merged in the master branch:
commit 59239caae3b08d07ad46873ad75b5048ef4c0ea1
Merge: 1776745968b65256ee58192ad615e0c8a4d135a7 c6ee17743fc1085e582e0a942e532f9e1f84784f
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed Feb 22 00:30:54 2012 +0100

    Merge branch 'upstream'


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