[Merge]: Merge with lp:openobject-addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Mon, 9 Aug 2010 12:03:56 +0000 (17:33 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Mon, 9 Aug 2010 12:03:56 +0000 (17:33 +0530)
commit2134d4a411c52ade85977f5c7e3082aac82765e1
tree02f7030ffd70439238f2e1d2fb4ac26f8ef6eaa3
parent5b6dcd8ffedc2ffd718d82097ca719c968a3df63
parente0422d53a19862980b82697ea0dd5cf86ce4d8bf
[Merge]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100809120356-2zg68er8uh1bke2g