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

[Orcan Ogetbil]

commit 9e3171634d924747cf491b73510d08ba868518e6
Merge: 053cec8 29c7746
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Wed Sep 29 18:25:19 2010 -0400

    Merge branch 'master' into f12

 ardour.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---