[SCM] jackd2/master: Merge commit 'upstream/1.9.7_dfsg'

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

Imported Upstream version 1.9.7~dfsg
Delete .DS_Store from upstream branch.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 72827ee0da2a23cdb1bb9d7e284b9edb750ae078
X-Git-Newrev: 6f79d88ba207f392f71021dc7c888e96d60c51cc

The following commit has been merged in the master branch:
commit c4ed87714a8bc0e39a00eddcbe4875c9ce405123
Merge: 72827ee0da2a23cdb1bb9d7e284b9edb750ae078 fe03c20e563674608081c1795455c394406a77d0
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Mar 31 13:54:31 2011 +0200

    Merge commit 'upstream/1.9.7_dfsg'


-- 
jackd2 packaging