fix merge problem
fix merge problem

howbazaar/juju,reedobrien/juju,reedobrien/juju,waigani/juju,frankban/juju,kat-co/juju,kat-co/juju,dooferlad/juju,dooferlad/juju,perrito666/juju,makyo/juju,bz2/juju,alesstimec/juju,frankban/juju,makyo/juju,mikemccracken/juju,AdamIsrael/juju,ericsnowcurrently/juju,alesstimec/juju,mikemccracken/juju,dooferlad/juju,axw/juju,mikemccracken/juju,ericsnowcurrently/juju,bogdanteleaga/juju,marcmolla/juju,makyo/juju,mjs/juju,howbazaar/juju,bac/juju,waigani/juju,marcmolla/juju,bogdanteleaga/juju,howbazaar/juju,axw/juju,gabriel-samfira/juju,mjs/juju,dooferlad/juju,frankban/juju,reedobrien/juju,bz2/juju,axw/juju,bac/juju,bac/juju,marcmolla/juju,reedobrien/juju,dimitern/juju,mjs/juju,gabriel-samfira/juju,davecheney/juju,reedobrien/juju,howbazaar/juju,waigani/juju,kat-co/juju,anastasiamac/juju,gabriel-samfira/juju,gabriel-samfira/juju,waigani/juju,mjs/juju,AdamIsrael/juju,axw/juju,dimitern/juju,dimitern/juju,dimitern/juju,anastasiamac/juju,kat-co/juju,bogdanteleaga/juju,macgreagoir/juju,davecheney/juju,howbazaar/juju,gabriel-samfira/juju,davecheney/juju,kat-co/juju,mjs/juju,mikemccracken/juju,alesstimec/juju,perrito666/juju,anastasiamac/juju,alesstimec/juju,AdamIsrael/juju,anastasiamac/juju,bogdanteleaga/juju,axw/juju,macgreagoir/juju,ericsnowcurrently/juju,dooferlad/juju,ericsnowcurrently/juju,anastasiamac/juju,mikemccracken/juju,marcmolla/juju,mjs/juju,bz2/juju,perrito666/juju,perrito666/juju,bac/juju,dimitern/juju,davecheney/juju,bz2/juju,AdamIsrael/juju,macgreagoir/juju,perrito666/juju,alesstimec/juju,macgreagoir/juju,macgreagoir/juju,mjs/juju,bac/juju,frankban/juju,bz2/juju,marcmolla/juju,frankban/juju,ericsnowcurrently/juju,makyo/juju