[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Mon, 15 Oct 2012 06:21:54 +0000 (11:51 +0530)
committerAmit Patel <apa@tinyerp.com>
Mon, 15 Oct 2012 06:21:54 +0000 (11:51 +0530)
commit5b9f60327296e310b524f3a28c67e00b24f1f02b
treebe26c49b01383a3dfe4469527765018a97ad2c97
parentfc94df2af5146d2780da3b07bf1fad78e6831889
parent7f23ad5de563eacfcae958d0011637800b097d4a
[MERGE]:trunk

bzr revid: apa@tinyerp.com-20121015062154-9yv7a92uyf2ngv9g