1a10d5f Update to 2.12 (#804920)

Authored and Committed by kalev 12 years ago
    Update to 2.12 (#804920)
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1