[MERGE] merged the branch that hide date fields as they will later be replaced by...
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 21 Mar 2012 16:54:40 +0000 (17:54 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 21 Mar 2012 16:54:40 +0000 (17:54 +0100)
bzr revid: qdp-launchpad@openerp.com-20120321165440-hl1shvdigj204td7


Trivial merge