fix merge error
fix merge error
perrito666/juju,bogdanteleaga/juju,alesstimec/juju,anastasiamac/juju,reedobrien/store,mattyw/juju,mikemccracken/juju,tych0/juju,mhilton/juju-juju,reedobrien/juju,cloud-green/juju,ericsnowcurrently/juju,waigani/juju,Altoros/juju-vmware,Altoros/juju-vmware,gabriel-samfira/juju,cherylj/juju,jrwren/juju,frankban/juju-tmp,mjs/juju,dooferlad/juju,bac/juju,dooferlad/juju,davecheney/juju,davecheney/juju,perrito666/juju,bz2/juju,dooferlad/juju,cloud-green/juju,kat-co/juju,howbazaar/juju,Altoros/juju-cloudsigma,jrwren/juju,makyo/juju,bac/juju,anastasiamac/juju,voidspace/juju,kat-co/juju,rogpeppe/juju,mhilton/juju,kat-co/juju,cloud-green/juju,tasdomas/juju,wwitzel3/juju,sinzui/juju,ericsnowcurrently/juju,mhilton/juju-juju,anastasiamac/juju,gabriel-samfira/juju,wwitzel3/juju,AdamIsrael/juju,dimitern/juju,howbazaar/juju,macgreagoir/juju,fwereade/juju,alesstimec/juju,reedobrien/juju,sinzui/juju,fwereade/juju,tsakas/juju,AdamIsrael/juju,cmars/juju,jrwren/juju,mjs/juju,marcmolla/juju,makyo/juju,mjs/juju,perrito666/juju,bogdanteleaga/juju,bogdanteleaga/juju,rogpeppe/juju,axw/juju,frankban/juju-tmp,waigani/juju,voidspace/juju,ericsnowcurrently/juju,tych0/juju,frobware/juju,fwereade/juju,marcoceppi/juju,dimitern/juju,sinzui/juju,Altoros/juju-cloudsigma,dooferlad/juju,howbazaar/juju,Altoros/juju-vmware,reedobrien/juju,makyo/juju,mattyw/juju,axw/juju,mattyw/juju,mikemccracken/juju,axw/juju,mjs/juju,cherylj/juju,frankban/juju,bac/juju,reedobrien/juju,mhilton/juju,tasdomas/juju,frankban/juju,waigani/juju,ericsnowcurrently/juju,marcoceppi/juju,cmars/juju,rogpeppe/juju,bz2/juju,axw/juju,Altoros/juju-cloudsigma,ericsnowcurrently/juju,mhilton/juju-juju,AdamIsrael/juju,tsakas/juju,kat-co/juju,cherylj/juju,cmars/juju,marcoceppi/juju,gabriel-samfira/juju,makyo/juju,voidspace/juju,bac/juju,howbazaar/juju,frankban/juju,thomnico/juju,anastasiamac/juju,tych0/juju,cmars/juju,marcoceppi/juju,cherylj/juju,mhilton/juju,thomnico/juju,tsakas/juju,mikemccracken/juju,alesstimec/juju,Altoros/juju-vmware,mattyw/juju,howbazaar/juju,mhilton/juju-juju,davecheney/juju,frankban/juju-tmp,gabriel-samfira/juju,bz2/juju,marcmolla/juju,dimitern/juju,AdamIsrael/juju,thomnico/juju,anastasiamac/juju,tasdomas/juju,marcmolla/juju,frobware/juju,mhilton/juju,marcmolla/juju,mikemccracken/juju,macgreagoir/juju,mjs/juju,frankban/juju-tmp,bz2/juju,sinzui/juju,axw/juju,perrito666/juju,gabriel-samfira/juju,alesstimec/juju,macgreagoir/juju,bogdanteleaga/juju,kat-co/juju,Altoros/juju-cloudsigma,perrito666/juju,frankban/juju,voidspace/juju,cloud-green/juju,tsakas/juju,thomnico/juju,mjs/juju,macgreagoir/juju,wwitzel3/juju,frankban/juju,bac/juju,frobware/juju,reedobrien/juju,marcmolla/juju,mjs/juju,wwitzel3/juju,macgreagoir/juju,tasdomas/juju,dooferlad/juju,dimitern/juju,alesstimec/juju,davecheney/juju,fwereade/juju,mikemccracken/juju,bz2/juju,tych0/juju,waigani/juju,dimitern/juju