merge
authorOlivier Laurent <olt@tinyerp.com>
Tue, 18 Nov 2008 11:43:20 +0000 (12:43 +0100)
committerOlivier Laurent <olt@tinyerp.com>
Tue, 18 Nov 2008 11:43:20 +0000 (12:43 +0100)
commitc7fbda545e89ee3e5eb77bc44b5644dc2c3674b4
treece70ba04a5ca3e8814e082f8bc27ed76f8a0586c
parenta509eb37108b20be78c6bdb3ae96e02317e4f9eb
parentd845e2f80c160d573cdf801e33699f8eca01a224
merge

bzr revid: olt@tinyerp.com-20081118114320-41p8yhekug0vlb7p