[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authorsbh (Open ERP) <sbh@tinyerp.com>
Fri, 27 Aug 2010 07:04:21 +0000 (12:34 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Fri, 27 Aug 2010 07:04:21 +0000 (12:34 +0530)
bzr revid: sbh@tinyerp.com-20100827070421-9w9xu4hg4sreptpm

1  2 
addons/project/project_view.xml

Simple merge