[MERGE]:lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa-period_journal-mma
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 4 May 2012 07:27:39 +0000 (12:57 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 4 May 2012 07:27:39 +0000 (12:57 +0530)
bzr revid: apa@tinyerp.com-20120504072739-w54isiphjl1jn1dv


Trivial merge