tree 6e4f48d0a3691896f5bdff655077e4db268a32bf
parent 13f3da50d40b89ee5b05f5f3de9542c20edac6d1
parent 0048b69c038306fe74408a63cdd0773b0d86a8fe
author Shawn O. Pearce <sop@google.com> 1293057975 -0800
committer Shawn O. Pearce <sop@google.com> 1293057975 -0800

Merge branch 'stable'

* stable:
  Fixed race condition in 'repo sync -jN' that would open multiple masters.