Merged revisions 570-575,577-578 via svnmerge from
[senf.git] / senfscons / __init__.py