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

[js at users.alioth.debian.org]

Imported Upstream version 1.9.6~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3189bc502412d71ae5946c814c1ed3cba8117fb9
X-Git-Newrev: 8ab92b2e1eeece5eeec0abbd01f2c85c56d949b5

The following commit has been merged in the master branch:
commit 46402a6fa3f062fd44a6a89475d7e30d5ada9120
Merge: 3189bc502412d71ae5946c814c1ed3cba8117fb9 2e5fb73e8464bcb66609d790010e327a99b9e1d4
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Oct 16 11:24:07 2010 +0200

    Merge commit 'upstream/1.9.6_dfsg'


-- 
jackd2 packaging