conflict resolved on simultaneous pkginfo fixes
conflict resolved on simultaneous pkginfo fixes

jppope/alloy,jppope/alloy,jvkops/alloy,brentonhouse/brentonhouse.alloy,WY08271/alloy,FokkeZB/alloy,FokkeZB/alloy,NadsonFernando/alloy,jppope/alloy,mobilehero/adamantium,WY08271/alloy,brentonhouse/brentonhouse.alloy,jvkops/alloy,WY08271/alloy,4talesa/alloy,xavierlacot/alloy,FokkeZB/alloy,brentonhouse/brentonhouse.alloy,jvkops/alloy,indera/alloy,bhatfield/alloy,indera/alloy,NadsonFernando/alloy,bhatfield/alloy,bhatfield/alloy,mobilehero/adamantium,indera/alloy,4talesa/alloy,xavierlacot/alloy,mobilehero/adamantium,NadsonFernando/alloy,xavierlacot/alloy,4talesa/alloy