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

[Thomas Moschny]

commit a3c3aff63fb31d740f8770591f87fc20663a5659
Merge: 3bde958 2f896fb
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Dec 18 13:13:38 2011 +0100

    Merge branch 'master' into el6

 .gitignore             |    1 +
 repack.sh              |    2 +-
 sources                |    2 +-
 waf-1.6.6-syntax.patch |   26 --------------------------
 waf-1.6.8-syntax.patch |   12 ------------
 waf.spec               |   12 +++++++-----
 6 files changed, 10 insertions(+), 45 deletions(-)
---