Summary of changes: 61cf661... backout non-pci configuration less patch, its breaks multi- (*) 1e95a0d... Merge branch 'master' into f18 (*) This commit already existed in another branch; no separate mail sent