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