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

[Thomas Moschny]

commit e6f39bda79b3c60d12ab9cca001e6620d77a470d
Merge: 734b820 a5b6c58
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Apr 17 13:44:07 2011 +0200

    Merge branch 'master' into el6

 .gitignore |    1 +
 repack.sh  |    2 +-
 sources    |    2 +-
 waf.spec   |    7 +++++--
 4 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc waf.spec
index d1c74f4,20c0edf..54f9988
--- a/waf.spec
+++ b/waf.spec
@@@ -6,11 -6,11 +6,11 @@@
  
  # Enable building without html docs (e.g. in case no recent sphinx is
  # available)
 -%global with_docs 1
 +%global with_docs 0
  
  Name:           waf
- Version:        1.6.3
- Release:        2%{?dist}
+ Version:        1.6.4
+ Release:        1%{?dist}
  Summary:        A Python-based build system
  Group:          Development/Tools
  # The entire source code is BSD apart from pproc.py (taken from Python 2.5)