bzr revid: mra@mra-laptop-20100818045314-kg11zkfizxlnn1bs
bzr revid: mra@mra-laptop-20100817114756-45vo32nh89xs2t9i