[MERGE]:lp:~openerp-dev/openobject-addons/trunk-fix-topbar-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 08:41:51 +0000 (14:11 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 08:41:51 +0000 (14:11 +0530)
bzr revid: apa@tinyerp.com-20120427084151-3rv8nt58y9y99hmo


Trivial merge