[MERGE]
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Thu, 29 Mar 2012 07:26:26 +0000 (12:56 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Thu, 29 Mar 2012 07:26:26 +0000 (12:56 +0530)
commit2085c8280db01b732842ab8598befd24799614a6
treecf1dc21d2ae098c35e4005524cff0c144ef84340
parentfbb16d2a1642750cccd687d5c88ed4e122869414
parent76a8424ceee9b3a43ae48d529a2394de0d67c28b
[MERGE]

bzr revid: sgo@tinyerp.com-20120329064102-r76ig4u2vfmj93ht
bzr revid: sgo@tinyerp.com-20120329072626-38rroiqxpm11dbie