merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 25 Aug 2010 18:10:10 +0000 (20:10 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 25 Aug 2010 18:10:10 +0000 (20:10 +0200)
commite93799e69f14c80939cf344ac1619b34ad7b30ba
treed70471c7210972cba467d7d1d3244c52a798c6ba
parentbf204f7ee455198597acfcf74229f9b447d49957
parentc1d29d19f6794762ff29923191b190238c4f4db3
merge

bzr revid: fp@tinyerp.com-20100825181010-2f9j481tx4bay0kk