[MERGE]:lp:~openerp-dev/openobject-addons/trunk-fix-topbar1-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Apr 2012 06:18:52 +0000 (11:48 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 30 Apr 2012 06:18:52 +0000 (11:48 +0530)
bzr revid: apa@tinyerp.com-20120430061852-adzh2gaz8jk2fy9j


Trivial merge