ba7a3bf update to latest HEAD

Merged and Committed by James Antill 12 years ago
    update to latest HEAD
    Fix upgrade_requirements_on_install breaking upgrade typos.
    
        
file modified
+5 -3
file modified
+5 -1