[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Wed, 1 Sep 2010 05:02:43 +0000 (10:32 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Wed, 1 Sep 2010 05:02:43 +0000 (10:32 +0530)
commitd17dc003de409d5bf5bb01adaca4660e9862500c
treeb6950314e3f918eb9bf6e9ae62f7556daa2e4622
parent53ac6a299eb0112753547a2741fe5a699157ddf7
parente08ada743251bcc15b5c4ef6ada289fcf85bfa59
[MERGE]

bzr revid: uco@tinyerp.com-20100901050243-defdm2xxy10ebhus