bzr revid: mra@mra-laptop-20100819054405-eb1dugq3pj8msqod
bzr revid: mra@mra-laptop-20100819045110-xwunpbnuqr1s5h0c