a98ce44 Update to upstream

Authored and Committed by dwalsh 12 years ago
    Update to upstream
    	* Release, minor version bump
    
        
file modified
+1 -0
file modified
+5 -1
file modified
+1 -1