[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp...
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Thu, 14 Jun 2012 13:01:39 +0000 (18:31 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Thu, 14 Jun 2012 13:01:39 +0000 (18:31 +0530)
bzr revid: atp@tinyerp.com-20120614130139-ottmi5ln5xmlzrn5


Trivial merge