3a72537 update to the latest git

Authored and Committed by atkac 11 years ago
    update to the latest git
    
    Signed-off-by: Adam Tkac <vonsch@gmail.com>
    
        
file modified
+4 -1
file modified
+599 -27