Summary of changes: d5dd03c... fix waitpid() override to not return immediately (*) ee3c798... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent