e1eaa1c Merge branch 'master' into f12/master

Merged and Committed by peter 13 years ago
    Merge branch 'master' into f12/master
    
    Conflicts:
    	.gitignore
    	flashrom-0.9.2.tar.bz2.asc
    	flashrom.spec
    	sources
    
        
file modified
+2 -0
file modified
+70 -14
file modified
+1 -1