[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue2_settings-cha
authorStephane Wirtel <stw@openerp.com>
Tue, 24 Jul 2012 11:39:43 +0000 (13:39 +0200)
committerStephane Wirtel <stw@openerp.com>
Tue, 24 Jul 2012 11:39:43 +0000 (13:39 +0200)
bzr revid: stw@openerp.com-20120724113943-ywl6qk4vkckcwgjr


Trivial merge