[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_timesheet_sheet-topbar-tpa
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 10:03:24 +0000 (15:33 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 10:03:24 +0000 (15:33 +0530)
bzr revid: apa@tinyerp.com-20120427100324-7s7rgmo78ehetvw5


Trivial merge