merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 27 Nov 2008 14:59:22 +0000 (15:59 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 27 Nov 2008 14:59:22 +0000 (15:59 +0100)
commit81721d269aff894b5929ef167410cacc1f317565
tree2be561c2c142a24cc0c1b274063407273a8d519d
parent5969ad4fff64ad7b395b56650b3df2e23c141241
parent3f40bc103e2bed92f4cf060e57636490aca94dfe
merge

bzr revid: fp@tinyerp.com-20081127145922-coxpmk4ywm9kzt80