[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authoratp (Open ERP) <atp@tinyerp.co.in>
Thu, 11 Nov 2010 06:33:28 +0000 (12:03 +0530)
committeratp (Open ERP) <atp@tinyerp.co.in>
Thu, 11 Nov 2010 06:33:28 +0000 (12:03 +0530)
commit25f8006e84d54fa5c64450c733bd26096de60c58
tree88680244830af8097501f735ad2c27d335a8ca78
parent80300fc795964e715fd14c7f30f6cc3f7f94d825
parente5b7eec612e79da7f99af91969503e8f19cd537f
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: atp@tinyerp.co.in-20101111063328-u21h7d3lyb8kq3ic