[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Tue, 25 Nov 2008 14:18:54 +0000 (15:18 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Tue, 25 Nov 2008 14:18:54 +0000 (15:18 +0100)
commit1e93c62bfd3122fdaa7c8a560952b03d2c9f67de
tree0abed183a2b84b15849d58f967b4e218ed6fdc14
parent9964f729c345dcf05a6c124cfe3bf0434569bca9
parent71885d3625495fbf197fbe0e181047d296f6804c
[MERGE]

bzr revid: stephane@tinyerp.com-20081125141854-6jx7y5y7kieg53o5