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