test between bzr and git
Merge branch 'master' of https://github.com/CiscoSystems/juju-vem