[waf/el6: 2/2] Merge branch 'master' into el6

[Thomas Moschny]

commit 3bde9587dbd3355afe60e98bc067e81577ad4bb3
Merge: ef0089a 9f952ac
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Nov 26 15:25:55 2011 +0100

    Merge branch 'master' into el6

 .gitignore           |    1 +
 repack.sh            |    7 +++++--
 sources              |    2 +-
 waf-1.6.9-logo.patch |   12 ++++++++++++
 waf.spec             |    8 +++++++-
 5 files changed, 26 insertions(+), 4 deletions(-)
---