proposal: merge waf build of s4 to master

[tridge at samba.org]

 > My only comment is that when I looked today at your waf-wip it still had
 > a couple of odd e-mail addresses as authors. 

fixed, thanks.

Cheers, Tridge