0f84883 - Upgrade to latest from NSA

Authored and Committed by dwalsh 16 years ago
    - Upgrade to latest from NSA
    Merge user and role mapping support from Joshua Brindle.
    
        
file modified
+6 -2