[waf/f13/master: 10/10] Merge branch 'master' into f13

[Thomas Moschny]

commit 277803e0f6114de824c8ef736a29507e8674acb1
Merge: fb6b73e 5396849
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Oct 2 23:44:56 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	sources
    	waf-1.5.12-libdir.patch
    	waf-1.5.17-libdir.patch
    	waf-1.5.19-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(-)
---