bzr revid: mra@mra-laptop-20100810093725-i2y5rq90h6qkfxlu
bzr revid: nel@tinyerp.com-20100614112930-nsefgdaw3cety5a6