06262c - Update to upstream

Authored and Committed by dwalsh 9 years ago
    - Update to upstream
    - Add vlock policy
    
        
file modified
+1 -0
file modified
+2 -2
file modified
+9 -2
file modified
+283 -889
file modified
+4 -0
file modified
+1 -0