[MERGE]: Merge with lp:openobject-addons/trunk
authorRucha (Open ERP) <rpa@tinyerp.com>
Thu, 17 Feb 2011 07:17:07 +0000 (12:47 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Thu, 17 Feb 2011 07:17:07 +0000 (12:47 +0530)
commit8528850f529211a9f1fc528bc8f9763493cb633d
tree617e9592dafd78f541cb6eed6095f812b71c53ff
parentf34b5ba2f14161bfe804593505a7c4616db108e8
parent5eb533a415f8e9738a81554cb4237597f1977485
[MERGE]: Merge with lp:openobject-addons/trunk

bzr revid: rpa@tinyerp.com-20110217071707-pk6t28uyn013fa35