[MERGE] Merge with lp:openobject-addons
authorSbh (OpenERP) <sbh@tinyerp.com>
Thu, 10 Feb 2011 04:51:43 +0000 (10:21 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Thu, 10 Feb 2011 04:51:43 +0000 (10:21 +0530)
commit8d46e51e3ac5d5caabbd27c70b6d6da7adc87116
treee266e7e7f78c55fb198af2bd16df29f090b91e88
parenta84b0ae4e782fff9659e447d58453f0d5abe3f17
parent7f5b7235cea9b4ffae2ffddca65757aafc40955c
[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20110208044605-wr3b2icgj1cazq1z
bzr revid: sbh@tinyerp.com-20110210045143-lds9k7r4cbp37xtc