[MERGE] https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability...
authorStephane Wirtel <stw@openerp.com>
Wed, 14 Sep 2011 15:13:23 +0000 (17:13 +0200)
committerStephane Wirtel <stw@openerp.com>
Wed, 14 Sep 2011 15:13:23 +0000 (17:13 +0200)
bzr revid: stw@openerp.com-20110914151323-cpuv9p7k2o3d2o4e


Trivial merge