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

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

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

The following commit has been merged in the master branch:
commit 648b6c9b804e26fe849f327908728eddf30c9c70
Merge: 35142d3cb4b3dc83d16439351893bd95a1c9d1d2 907e64be9c0a26486daf65ffbce827a7bcc47ef6
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sat Sep 24 18:46:33 2011 +0200

    Merge commit 'upstream/2.0.99+svn1995'


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