[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authoratp (Open ERP) <atp@tinyerp.co.in>
Thu, 18 Nov 2010 11:49:29 +0000 (17:19 +0530)
committeratp (Open ERP) <atp@tinyerp.co.in>
Thu, 18 Nov 2010 11:49:29 +0000 (17:19 +0530)
bzr revid: atp@tinyerp.co.in-20101118050848-nzneb3ippw9ga455
bzr revid: atp@tinyerp.co.in-20101118114929-d8yjmla77aletsjy


Trivial merge