[rubberband/el5: 15/15] Merge branch 'master' into el5

[Michel Alexandre Salim]

commit 18d3eef916b2002ec6a6fa1dfafc04b7e2c58fb9
Merge: 5f49de4 b8b5504
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Jul 15 11:00:16 2011 +0200

    Merge branch 'master' into el5

 .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(-)
---