fix post-merge build problem
fix post-merge build problem

tasdomas/juju,marcmolla/juju,macgreagoir/juju,mhilton/juju-juju,tsakas/juju,mhilton/juju,frankban/juju,AdamIsrael/juju,mhilton/juju,reedobrien/juju,wwitzel3/juju,davecheney/juju,voidspace/juju,bz2/juju,frankban/juju-tmp,frankban/juju-tmp,bz2/juju,anastasiamac/juju,kat-co/juju,bogdanteleaga/juju,axw/juju,waigani/juju,bac/juju,marcmolla/juju,tych0/juju,mjs/juju,mjs/juju,bogdanteleaga/juju,alesstimec/juju,Altoros/juju-cloudsigma,axw/juju,tsakas/juju,mhilton/juju-juju,dimitern/juju,mjs/juju,macgreagoir/juju,cherylj/juju,voidspace/juju,tasdomas/juju,mikemccracken/juju,frankban/juju-tmp,gabriel-samfira/juju,fwereade/juju,ericsnowcurrently/juju,thomnico/juju,mjs/juju,voidspace/juju,gabriel-samfira/juju,tsakas/juju,mikemccracken/juju,waigani/juju,thomnico/juju,bogdanteleaga/juju,reedobrien/juju,reedobrien/juju,davecheney/juju,frankban/juju,tych0/juju,cloud-green/juju,mjs/juju,marcmolla/juju,AdamIsrael/juju,AdamIsrael/juju,bac/juju,perrito666/juju,cloud-green/juju,macgreagoir/juju,bz2/juju,bac/juju,gabriel-samfira/juju,alesstimec/juju,davecheney/juju,mikemccracken/juju,ericsnowcurrently/juju,makyo/juju,wwitzel3/juju,perrito666/juju,alesstimec/juju,perrito666/juju,frankban/juju,reedobrien/juju,tasdomas/juju,wwitzel3/juju,tsakas/juju,cherylj/juju,cloud-green/juju,dooferlad/juju,axw/juju,marcmolla/juju,mjs/juju,mikemccracken/juju,AdamIsrael/juju,frankban/juju,ericsnowcurrently/juju,anastasiamac/juju,mhilton/juju,mjs/juju,Altoros/juju-cloudsigma,kat-co/juju,dooferlad/juju,howbazaar/juju,frankban/juju-tmp,dimitern/juju,makyo/juju,bac/juju,dooferlad/juju,bz2/juju,mhilton/juju,davecheney/juju,fwereade/juju,tych0/juju,howbazaar/juju,thomnico/juju,voidspace/juju,cherylj/juju,mhilton/juju-juju,bz2/juju,gabriel-samfira/juju,axw/juju,anastasiamac/juju,mhilton/juju-juju,tych0/juju,makyo/juju,dooferlad/juju,perrito666/juju,howbazaar/juju,howbazaar/juju,dimitern/juju,macgreagoir/juju,Altoros/juju-cloudsigma,frankban/juju,fwereade/juju,howbazaar/juju,macgreagoir/juju,gabriel-samfira/juju,Altoros/juju-cloudsigma,fwereade/juju,tasdomas/juju,alesstimec/juju,waigani/juju,dooferlad/juju,bac/juju,makyo/juju,kat-co/juju,anastasiamac/juju,mikemccracken/juju,axw/juju,dimitern/juju,ericsnowcurrently/juju,ericsnowcurrently/juju,bogdanteleaga/juju,reedobrien/juju,kat-co/juju,wwitzel3/juju,anastasiamac/juju,kat-co/juju,waigani/juju,marcmolla/juju,thomnico/juju,cherylj/juju,alesstimec/juju,cloud-green/juju,perrito666/juju,dimitern/juju