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