[MERGE] Latest fixes from 6.1
authorOlivier Dony <odo@openerp.com>
Wed, 14 Mar 2012 14:20:43 +0000 (15:20 +0100)
committerOlivier Dony <odo@openerp.com>
Wed, 14 Mar 2012 14:20:43 +0000 (15:20 +0100)
bzr revid: odo@openerp.com-20120314142043-9jpk3dkss1hkvb3q

1  2 
openerp/modules/loading.py

Simple merge