bzr revid: mra@mra-laptop-20100720100504-z58vuacwufstsaxp
bzr revid: mra@mra-laptop-20100716124615-vw1yspuokgcq5fmz