[MERGE] trunk
authorThibault Francois <tfr@openerp.com>
Mon, 11 Apr 2011 11:46:53 +0000 (13:46 +0200)
committerThibault Francois <tfr@openerp.com>
Mon, 11 Apr 2011 11:46:53 +0000 (13:46 +0200)
commit99fb6b258b36ed747935881c21c1cb4f6669a811
treeb27103285eee5070f11384fd27987927980eb9c6
parent047b10f0ff2c55270a084b3e2eff7455997f9950
parentc05b34c4094952b43624bcc83e5e11ca540e3440
[MERGE] trunk

bzr revid: tfr@openerp.com-20110411114653-b6w336jsx0u4hne4