[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Tue, 7 Sep 2010 05:03:57 +0000 (10:33 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Tue, 7 Sep 2010 05:03:57 +0000 (10:33 +0530)
commite44b44f8c21e044639a8fa9c1104a492dd3b77af
tree8eb51c0505e5f1b808282507a482362a3f2f07ca
parent89f90363560012bc6fe6df5a75420d0e2d1fb606
parenta7be946e1b9d820cc1e9544a47409df2f43b04f8
[MERGE]

bzr revid: uco@tinyerp.com-20100907050357-w3tcj5nagiopd83j