[audacity/f17: 11/11] Merge remote-tracking branch 'origin/master' into f17

[Hans de Goede]

commit 68a98e3b4e6d9506fff0670c6fac48d95f76f70b
Merge: a7f188d 9ae00ab
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu May 9 15:05:58 2013 +0200

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	audacity.spec

 .gitignore    |    2 +
 README        |  164 ---------------------------------------------------------
 audacity.spec |   98 ++++++++++++++++++----------------
 sources       |    4 +-
 4 files changed, 56 insertions(+), 212 deletions(-)
---