[MERGE]: Merged with parent branch
authoruco (OpenERP) <uco@tinyerp.co.in>
Wed, 30 Dec 2009 05:23:15 +0000 (10:53 +0530)
committeruco (OpenERP) <uco@tinyerp.co.in>
Wed, 30 Dec 2009 05:23:15 +0000 (10:53 +0530)
commit99c56cd31bdd0ae918c5821e37813a2f795a0e81
tree410ef02ac69cf0ba47d70f2e888911a3603a00ee
parentfbeb3a52faa54defb1e0652e096ba8b9ce408bcf
parent4b560a5f40100d252dcf522e0ccca29dfdc0274e
[MERGE]: Merged with parent branch

bzr revid: uco@tinyerp.co.in-20091230052315-9sgj4cah5577hqpr