[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authoratp (Open ERP) <atp@tinyerp.co.in>
Fri, 12 Nov 2010 13:42:27 +0000 (19:12 +0530)
committeratp (Open ERP) <atp@tinyerp.co.in>
Fri, 12 Nov 2010 13:42:27 +0000 (19:12 +0530)
bzr revid: atp@tinyerp.co.in-20101112134227-xd2j1mmwrm0q7197


Trivial merge