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

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

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

The following commit has been merged in the master branch:
commit 041bc3c3e1fac68fca2a1553494c380d62019504
Merge: e4662045dd14f919625181a53c6018dd8035d94f 93f1a8c6fe76791d5f729b02f1ea4da2bd645cec
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sat Apr 2 13:50:28 2011 +0200

    Merge commit 'upstream/2.0.99+svn1968'


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