[MERGE]
authorOlivier Laurent <olt@tinyerp.com>
Tue, 7 Jul 2009 07:14:13 +0000 (09:14 +0200)
committerOlivier Laurent <olt@tinyerp.com>
Tue, 7 Jul 2009 07:14:13 +0000 (09:14 +0200)
commitfdc9bab2a44bb4f0d7fd8b3cbc5ebf76a89004e3
treeee7647e5d15d67508b6041a60856c51e475539b4
parent5f978c5f47237b830f6be40a151d74f8f81801ea
parent2719646907fc6a5e2f080bbdfbfb8f8cd0a8b139
[MERGE]

bzr revid: olt@tinyerp.com-20090707071413-6hp0dcgsh1tqbdnc