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