[flashrom/el5] (2 commits) ...Merge branch 'master' into el5