[SCM] ffado/master: Merge commit 'upstream/2.0.99+svn1985'

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

Imported Upstream version 2.0.99+svn1985
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d0f7aeaa372e7fb8af126848eade234480bbfbb0
X-Git-Newrev: 58448b28980318c2630217c7da08242990e4b7ed

The following commit has been merged in the master branch:
commit a9a7fd4d519568ce229756bab06c942c98ae1015
Merge: d0f7aeaa372e7fb8af126848eade234480bbfbb0 cb3622a71a1e61d30bfef618040b6f6d15d142ce
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue May 31 17:25:13 2011 +0200

    Merge commit 'upstream/2.0.99+svn1985'


-- 
Free Firewire Audio Drivers (ffado.org) packaging