[MERGE]merge with parent branch
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Mon, 4 Jun 2012 12:19:55 +0000 (17:49 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Mon, 4 Jun 2012 12:19:55 +0000 (17:49 +0530)
commit812cdd10c0b9d6a5e78efef741adc2e770822949
treeca92717398d5dd5ee7b44f467d6be9b6716aaec6
parent0661e8056d6cc59426c3f53705c83baaf4985f60
parentf5c7e060b888be686e94f6badac003d698337812
[MERGE]merge with parent branch

bzr revid: sgo@tinyerp.com-20120604121955-3127jgv602ddhlyu