import from trunk -- fix lock and release lock lines (cosmetic change -- it doesn't matter what you call the lock)
Changed paths: