bzr revid: stw-eb6ee9b006e577bda6338caa450ec9795b12f9bc
bzr revid: ced-906040f427807eec662927bd5c3b6fc4210890da