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

[Thomas Moschny]

commit 5bf589fcecf062b58bf700e507e755d66bdceb97
Merge: 87d3d35 bb08350
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Jun 19 16:14:19 2011 +0200

    Merge branch 'master' into el6

 .gitignore             |    1 +
 repack.sh              |    5 +++--
 sources                |    2 +-
 waf-1.6.6-syntax.patch |   26 ++++++++++++++++++++++++++
 waf.spec               |   17 ++++++++++++++---
 5 files changed, 45 insertions(+), 6 deletions(-)
---
diff --cc waf.spec
index 3fcb0e5,4e11da9..2163c87
--- a/waf.spec
+++ b/waf.spec
@@@ -140,9 -146,13 +146,14 @@@ rm -rf %{buildroot
  
  
  %changelog
+ * Sat Jun 18 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.6-1
+ - Update to 1.6.6.
+ - Remove unused extras/subprocess.py.
+ - Small patch for syntax errors.
+ 
  * Sun Apr 17 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.4-1
  - Update to 1.6.4.
 +- Re-enable building of html docs for EL-6.
  
  * Sat Apr  9 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.3-2
  - Use python-sphinx10 where available.