[MERGE] Merge with lp:openobject-addons
authorsbh (Open ERP) <sbh@tinyerp.com>
Thu, 11 Nov 2010 04:59:44 +0000 (10:29 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Thu, 11 Nov 2010 04:59:44 +0000 (10:29 +0530)
commite5b7eec612e79da7f99af91969503e8f19cd537f
tree69720d7211035923441cc5bb310ca9da20cced02
parentc46e496b7080aad570933fa7c32a880f93f0ccf2
parent9e785c262565a039f700f0fb437871780496d980
[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20101111045944-0hm1yxx00x4syiw0