[ardour/f12/master: 14/14] Merge branch 'master' into f12

[Orcan Ogetbil]

commit 053cec84583ddc47adab3c99411ec723297c6dde
Merge: e1bf79c 5a18d11
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Wed Sep 29 15:54:52 2010 -0400

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

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