[MERGE]with parent branch
authorPinakin Nayi (OpenERP) <pna@tinyerp.com>
Mon, 12 Nov 2012 05:57:26 +0000 (11:27 +0530)
committerPinakin Nayi (OpenERP) <pna@tinyerp.com>
Mon, 12 Nov 2012 05:57:26 +0000 (11:27 +0530)
commit56841d8cdf325d9cb94fbd352aefe3e82825c9f6
treed1a90b6fb265cdfa041bb951fd6a8bc7f4e93170
parent1548e22d42c779318f0981e9b3167c23afcef64c
parent53fdee00ce77e5cbaff8a2d0f87a1dd0047d80e3
[MERGE]with parent branch

bzr revid: pna@tinyerp.com-20121112055726-37edozvmfnp9feyk