Updated waflib to latest master from https://code.google.com/p/waf/source/list?name=waf-1.7 (rev 9b59102d35d9)
Merge branches from different machines.