Summary of changes: 17f12e5... added various upstream patches (*) a21eca5... Merge branch 'master' into el5 (*) This commit already existed in another branch; no separate mail sent