bzr revid: jni@tinyerp.com-20100625082527-savf6rj31yrz81e1
bzr revid: sbh@tinyerp.com-20100607110630-3uszeemgepx76cus