[Merge]
authorThibault Francois <tfr@openerp.com>
Thu, 20 Jan 2011 16:47:06 +0000 (17:47 +0100)
committerThibault Francois <tfr@openerp.com>
Thu, 20 Jan 2011 16:47:06 +0000 (17:47 +0100)
commite519dac248c050f9cd7f5adbff60b48e892b4983
tree69a161f5ce8ef828ba422315d6a0c2f53637387c
parent603cdf7384a8361d9c34ddcb04e50147345188e1
parent3b249c14ef4eb61306b095c632d8b1efecd2bfba
[Merge]

bzr revid: tfr@openerp.com-20110120164706-i9degss13cmbryiz