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

[Thomas Moschny]

commit 2a9bc8b6bab5b04399e00a9a0174460568a18893
Merge: 532711c 5396849
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Fri Jan 7 00:16:49 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	waf-1.5.17-libdir.patch
    	waf-1.5.19-libdir.patch
    	waf-1.5.9-libdir.patch
    	waf.spec

 .gitignore                                         |    3 +-
 sources                                            |    2 +-
 ...arty.patch => waf-1.5.19-install_3rdparty.patch |    2 +-
 waf-1.5.17-libdir.patch => waf-1.5.19-libdir.patch |    4 +-
 waf.spec                                           |   23 +++++++++++++++----
 5 files changed, 24 insertions(+), 10 deletions(-)
---