[MERGE] merged the addons branch of config rework project
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 6 Jul 2011 22:30:08 +0000 (00:30 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 6 Jul 2011 22:30:08 +0000 (00:30 +0200)
bzr revid: qdp-launchpad@openerp.com-20110706223008-6qaf5mzb5zy5pa7r


Trivial merge