[MERGE] Merged with main addons
authorThibault Delavallée <tde@openerp.com>
Wed, 15 Feb 2012 13:48:40 +0000 (14:48 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 15 Feb 2012 13:48:40 +0000 (14:48 +0100)
bzr revid: tde@openerp.com-20120215134840-yaohsrb50crhjr90

1  2 
addons/project/project.py

Simple merge