[rubberband/el6: 9/9] Merge branch 'master' into el6

Fri Jul 15 08:46:22 UTC 2011

commit 5c77b49d1cc262a24bfe210466d20aa9ce2d78b2
Merge: 52ac69b b8b5504
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Jul 15 10:45:55 2011 +0200

    Merge branch 'master' into el6

 .gitignore                     |    2 +-
 rubberband-1.5.0-fix_ver.patch |   20 --------------------
 rubberband-1.5.0-gcc44.patch   |   11 -----------
 rubberband-1.6.0-fix_ver.patch |   11 +++++++++++
 rubberband-1.6.0-gcc46.patch   |   10 ++++++++++
 rubberband.spec                |   19 +++++++++++++------
 sources                        |    2 +-
 7 files changed, 36 insertions(+), 39 deletions(-)
---