[MERGE]:with parent branch
authorPinakin Nayi (OpenERP) <pna@tinyerp.com>
Thu, 13 Sep 2012 09:34:44 +0000 (15:04 +0530)
committerPinakin Nayi (OpenERP) <pna@tinyerp.com>
Thu, 13 Sep 2012 09:34:44 +0000 (15:04 +0530)
commit55f88676705fa3f26ffa5a224e0e3bc6824e95c2
tree201e515604d3e88ceb5af88d5c50347658183936
parent7ca72b62e9f62a5fb592880b7757a1bced8dad8b
parentd66b04b75b99348420d613342072dcf3a1b72357
[MERGE]:with parent branch

bzr revid: pna@tinyerp.com-20120913093444-n06lxdnyrap84w3x