bzr revid: mra@mra-laptop-20100818045314-kg11zkfizxlnn1bs
bzr revid: mra@mra-laptop-20100818041203-hlqnf8uvaf02oj4g