[MERGE]:lp:~openerp-dev/openobject-addons/trunk-fix1-topbar-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Apr 2012 09:27:31 +0000 (14:57 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Apr 2012 09:27:31 +0000 (14:57 +0530)
bzr revid: apa@tinyerp.com-20120430092731-2ufc976hqzjr5gse


Trivial merge