1. more rework of CONARY parsing 2. fixed inadvertant diff commit
1. more rework of CONARY parsing
2. fixed inadvertant diff commit

fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary