[MERGE] merged with openobject-addons
authorHarry (OpenERP) <hmo@tinyerp.com>
Wed, 27 Oct 2010 11:44:30 +0000 (17:14 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Wed, 27 Oct 2010 11:44:30 +0000 (17:14 +0530)
commit77f013e04683b201254f22fde826daa8112b578e
tree7a94d500f12a62e20877c38da5bfd06e79b10af9
parentcbc52ce4586bfc9bf280c3baa4d454c8605e00a0
parenta91878d868070be7f707c86de524b9283c86c61b
[MERGE] merged with openobject-addons

bzr revid: hmo@tinyerp.com-20101027114430-ojh3oy03g65vnh7g