[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Mon, 12 Jul 2010 11:23:32 +0000 (16:53 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Mon, 12 Jul 2010 11:23:32 +0000 (16:53 +0530)
commit95c55fff7c2fb52ceef1d697454454d134f3c880
treeb74bdd080d86f7709957901e4eb730a26ebea96a
parent3502ef78de05c772b20ea97c0ca47042744a0c53
parent0450d6d5897184699afd7c294898b7ebf1a2a8cb
[MERGE]

bzr revid: hmo@tinyerp.com-20100712112332-e1uhmq93a2jesv0z