2cef4f Merge branch 'scripts'

Merged and Committed by Michal Marek 11 years ago
    Merge branch 'scripts'
    
    Conflicts:
    	scripts/run_oldconfig.sh
    
        
file modified
+1 -1