[MERGE] merged the dev branch with enhancement and refactoring of code to generate...
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 9 Dec 2011 10:14:11 +0000 (11:14 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 9 Dec 2011 10:14:11 +0000 (11:14 +0100)
bzr revid: qdp-launchpad@openerp.com-20111209101411-ewjshwbbvp3o7yyj


Trivial merge