bzr revid: tsy@baamtu.com-20110411152503-mcaropfxxdpla2fs
bzr revid: tsy@baamtu.com-20110407165557-r3rhnm5x8i1jboqx