[libffado/f14/master: 4/4] Merge branch 'master' into f14

[Orcan Ogetbil]

commit 90b8f45537b260b11fc59cfbadf37eb0131fa266
Merge: 547f703 9368290
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Fri Oct 15 03:42:29 2010 -0400

    Merge branch 'master' into f14
    
    Conflicts:
    	libffado.spec

 .gitignore                           |    1 +
 libffado-desktop.patch               |   17 -
 libffado-dont-use-bundled-libs.patch | 1148 ----------------------------------
 libffado-snapshot.sh                 |   33 +
 libffado.spec                        |   27 +-
 sources                              |    2 +-
 6 files changed, 46 insertions(+), 1182 deletions(-)
---