[Merge]with : lp:~openerp-dev/openobject-server/trunk-settings-wizards-improvements-jap
authorDBR (OpenERP) <dbr@tinyerp.com>
Wed, 2 May 2012 06:46:44 +0000 (12:16 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Wed, 2 May 2012 06:46:44 +0000 (12:16 +0530)
bzr revid: dbr@tinyerp.com-20120502064644-ohndwmnt8bwag489


Trivial merge