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

[Thomas Moschny]

commit ef0089a2d5d6e74fe5da2024ae4771347951d954
Merge: 5bf589f 7f3de81
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Oct 16 15:36:34 2011 +0200

    Merge branch 'master' into el6

 .gitignore             |    1 +
 repack.sh              |    2 +-
 sources                |    2 +-
 waf-1.6.8-syntax.patch |   12 +++++++
 waf.spec               |   81 +++++++++++++++++++++++++++++++++++++++++------
 5 files changed, 85 insertions(+), 13 deletions(-)
---