[Merge]with : lp:~openerp-dev/openobject-server/trunk-settings-wizards-improvements-jap
[Merge]with : lp:~openerp-dev/openobject-server/trunk-settings-wizards-improvements-jap
gisce/openobject-server,splbio/openobject-server,splbio/openobject-server,gisce/openobject-server,MarkusTeufelberger/openobject-server,splbio/openobject-server,ovnicraft/openerp-server,MarkusTeufelberger/openobject-server,MarkusTeufelberger/openobject-server,gisce/openobject-server,ovnicraft/openerp-server