e8a0807 Rebase against version 0.7.1

Authored and Committed by gholms 11 years ago
    Rebase against version 0.7.1
    
        
file modified
+5 -5
file modified
+1 -1