[MERGE]: merge with trunk-configrework3-crm
authorksa (Open ERP) <ksa@tinyerp.co.in>
Thu, 18 Aug 2011 08:49:14 +0000 (14:19 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Thu, 18 Aug 2011 08:49:14 +0000 (14:19 +0530)
bzr revid: ksa@tinyerp.co.in-20110818084914-jayor0mgrivwq7x2

1  2 
addons/project/project_view.xml

Simple merge