merge
authorOlivier Laurent <olt@tinyerp.com>
Mon, 3 Nov 2008 13:03:08 +0000 (14:03 +0100)
committerOlivier Laurent <olt@tinyerp.com>
Mon, 3 Nov 2008 13:03:08 +0000 (14:03 +0100)
commit0b500fec75087a5536875401b9d9b30c31f3e838
tree0c8ebba9fbdd14dea453da50461de9073751f52b
parentf6cd8e5473ac7ba9f1a1ed944a997334753b01ea
parent695f9329dfdadfeb402dfda6eed52d1083eb0675
merge

bzr revid: olt@tinyerp.com-20081103130308-1pd1xh1nnj46n0z2