[MERGE]:merged config wizard for company
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 08:49:10 +0000 (14:19 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 08:49:10 +0000 (14:19 +0530)
bzr revid: apa@tinyerp.com-20120720084910-0f4v91nnmgjg2sx6


Trivial merge