[MERGE]
authormra (Open ERP) <mra@tinyerp.com>
Fri, 28 May 2010 04:44:09 +0000 (10:14 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Fri, 28 May 2010 04:44:09 +0000 (10:14 +0530)
bzr revid: mra@tinyerp.com-20100528044409-swx3ubvg0enzg3t1

1  2 
addons/account/report/__init__.py
addons/project/project_view.xml
addons/project/report/project_report_view.xml

Simple merge
Simple merge