Let rmdir timeout after self.timeout.
Test for the timeout parameter.
Add timeout to cpdir
Test for step.timeout instead of a fixed amount.
Merge branch 'source-cvs-pass-timeout-to-rmdir' of git://github.com/jpommerening/buildbot