branch merge from conary 2.1->rBuilder bayonet conary
branch merge from conary 2.1->rBuilder bayonet conary

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