[PATCH] some fixes for waf issues

[Christian Ambach]

Am 16.01.14 00:37, schrieb Andrew Bartlett:

> Please be consistent and use UTF-8.  (It seems silly, but we have
> pending some tests that compare the docs with our testparm-indicated
> defaults).

The patches have landed in master, including this small change.

> Otherwise, these look OK.  Just make sure we undo the build farm changes
> once this is pushed to autobuild.

Please make the necessary changes to the buildfarm.
Thanks!

Cheers,
Christian