More locking issues.
Merge branch 'master' of https://github.com/adaptivecomputing/torque