[MERGE] Merge with lp:openobject-addons
authorBhumika (OpenERP) <sbh@tinyerp.com>
Fri, 4 Mar 2011 04:39:27 +0000 (10:09 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Fri, 4 Mar 2011 04:39:27 +0000 (10:09 +0530)
commit1c74497dfc4cae67d17e8b516a077f7b8784a3b7
treefcc9269681d36675e880a74abc6477dd3be95561
parent7c512f970bf4485b61101a513145c10d0a1ae29f
parentaadac1dea3a917f03e4b7f7c992f12a2108159f2
[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20110304043927-9q3rkvmjwwawvn07