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