[MERGE]
authorBhumika (OpenERP) <sbh@tinyerp.com>
Mon, 28 Feb 2011 06:56:11 +0000 (12:26 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Mon, 28 Feb 2011 06:56:11 +0000 (12:26 +0530)
commit515d7210065fb8fac1884e2550919aa557b73ed5
treec223a9c07e4f94f82476bc170edcf8e83448be4b
parentd5a3fea1f1565c6e0e41f2b1539887cbf8db03d9
parent3555304a09613bc46e86e6c62ef91767ea3708b1
[MERGE]

bzr revid: sbh@tinyerp.com-20110228065611-4g01cr0he40fu7ft