[MERGE] : Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authorsbh (Open ERP) <sbh@tinyerp.com>
Fri, 11 Jun 2010 06:19:41 +0000 (11:49 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Fri, 11 Jun 2010 06:19:41 +0000 (11:49 +0530)
commitd693dde6ee763fb5412fc7a755dec9eed9a9eb63
treed702ea8a5735fa22794d8bc80f0e76fe2a553519
parent8f3a929601187659d51f6535b1423e931d7bbb8e
parent9134be65e669f1e310565ca85152a10000a6954c
[MERGE] : Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: sbh@tinyerp.com-20100611061941-h8ei7ncpbf7nd9e3