[MERGE]
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Fri, 30 Mar 2012 08:34:02 +0000 (14:04 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Fri, 30 Mar 2012 08:34:02 +0000 (14:04 +0530)
commit5d4b8c2e58cf647cc8f8d115e3e8ba16c0d310eb
tree8e96d4dd544f8a721771cf9ec9d9bf2d35bb0c9c
parent355f15b4560cd431bd617b53a7d20adfb1a61e01
parentf9398e1384d873b4311a4668e0e9b5dc0cc184ab
[MERGE]

bzr revid: sgo@tinyerp.com-20120330055738-pyik91wj6hpnm2ru
bzr revid: sgo@tinyerp.com-20120330083402-dc3vu8w5l887rs5q