Fixed race condition bug
Merged with svn 2004
Bad rsync, no cookie