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