[MERGE] merged branch from aag with user's preferences config wizard
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 27 May 2011 13:11:42 +0000 (15:11 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 27 May 2011 13:11:42 +0000 (15:11 +0200)
bzr revid: qdp-launchpad@openerp.com-20110527131142-i4marv3urjh2yjwl


Trivial merge