[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authorrpa (Open ERP) <rpa@tinyerp.com>
Mon, 10 Jan 2011 05:35:57 +0000 (11:05 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Mon, 10 Jan 2011 05:35:57 +0000 (11:05 +0530)
commitfdc5f0224ce97550f3f32ec01b06d076ecd3a10e
tree328236f04b6d63aa7c020ed4bdcc4f453f48dbdf
parent312430a24aca5b78e9279f8cd9febf028f2f53fc
parenta98517c2ad52598da6a9eef447405f525448a538
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: rpa@tinyerp.com-20110110053557-1ve5xmocoxa2wsr3