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