[ardour/f13/master: 9/9] Merge branch 'master' into f13

[Orcan Ogetbil]

commit fb5149954d74078120dc2f5935f1e4c9c5ac17ba
Merge: 95c4680 5a18d11
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Wed Sep 29 15:52:52 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	ardour.spec

 ardour-safe-env-vars.patch |   14 ++++++++++++++
 ardour.spec                |   15 ++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---