[MERGE] merged with lasted trunk

author Harry (OpenERP) <hmo@tinyerp.com>

Fri, 22 Jun 2012 05:16:42 +0000 (10:46 +0530)

committer Harry (OpenERP) <hmo@tinyerp.com>

Fri, 22 Jun 2012 05:16:42 +0000 (10:46 +0530)
author Harry (OpenERP) <hmo@tinyerp.com>
Fri, 22 Jun 2012 05:16:42 +0000 (10:46 +0530)
committer Harry (OpenERP) <hmo@tinyerp.com>
Fri, 22 Jun 2012 05:16:42 +0000 (10:46 +0530)
diff --cc addons/hr_attendance/hr_attendance_view.xml
Simple merge
diff --cc addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
Simple merge
author	Harry (OpenERP) <hmo@tinyerp.com>
	Fri, 22 Jun 2012 05:16:42 +0000 (10:46 +0530)
committer	Harry (OpenERP) <hmo@tinyerp.com>
	Fri, 22 Jun 2012 05:16:42 +0000 (10:46 +0530)
		1	2
addons/hr_attendance/hr_attendance_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history