[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Wed, 12 Sep 2012 12:11:16 +0000 (17:41 +0530)
committerAmit Patel <apa@tinyerp.com>
Wed, 12 Sep 2012 12:11:16 +0000 (17:41 +0530)
commited34adf9b0e5aabd0b8d755b88c419661c257721
tree03c27063f25474f3e0059d3b390c9f5de6d4cd62
parentd52e25483482b464c37695abf8d24e94598f3516
parent61a8001688e0be2d00fb3846a26d208eebc6a2e7
[MERGE]:trunk

bzr revid: apa@tinyerp.com-20120912121116-1hpl73spulp9670o