[MERGE]: Merge with lp:openobject-addons
authorYsa (Open ERP) <ysa@tinyerp.co.in>
Thu, 22 Apr 2010 05:20:25 +0000 (10:50 +0530)
committerYsa (Open ERP) <ysa@tinyerp.co.in>
Thu, 22 Apr 2010 05:20:25 +0000 (10:50 +0530)
commitc3be7487084bf41b69d82873d16be84ee49f6a12
treee1a166ad5ecb9c67668181029957b6aa496bd8ee
parent40555c91057334a6c6d26b743195322c8fa7ba28
parent8df4383517f2c984759f5540fa806f0bbf6fd657
[MERGE]: Merge with lp:openobject-addons

bzr revid: ysa@tinyerp.co.in-20100422052025-ied35d7m67qg4mmf