[MERGE] trunk fixes
authorXavier Morel <xmo@openerp.com>
Wed, 13 Jul 2011 15:35:14 +0000 (17:35 +0200)
committerXavier Morel <xmo@openerp.com>
Wed, 13 Jul 2011 15:35:14 +0000 (17:35 +0200)
commit1a429814bc49b4406f860df52be26c2e1b4078d8
treefa0bfc99581151bbe058fa209067eaf6e541bb64
parentdab290d3695a9994d5ca116906d1ad82b016dd14
parentd45e291329edc2e980650a73bae1515c4a3bd043
[MERGE] trunk fixes

bzr revid: xmo@openerp.com-20110713153514-skv4e54mbnidm5dt