[libffado/f13/master: 6/6] Merge branch 'master' into f13

[Orcan Ogetbil]

commit 1852faddeaf75a075ca122394cdc2328847d644d
Merge: 78bfbd9 9368290
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Fri Oct 15 03:44:56 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	libffado.spec
    	sources

 .gitignore           |    1 +
 libffado-snapshot.sh |   33 +++++++++++++++++++++++++++++++++
 libffado.spec        |   34 ++++++++++++++++++----------------
 sources              |    2 +-
 4 files changed, 53 insertions(+), 17 deletions(-)
---