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

[Thomas Moschny]

commit 2f7644e3802dc076d9ba373dbc2c19bd0a60124d
Merge: f2b43b3 5396849
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Oct 2 23:50:47 2010 +0200

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

 .gitignore                                         |    1 +
 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                                           |   18 ++++++++++++++----
 5 files changed, 19 insertions(+), 8 deletions(-)
---