[MERGE]: Merged with team1.

author uco (OpenERP) <uco@tinyerp.com>

Thu, 28 Oct 2010 07:05:42 +0000 (12:35 +0530)

committer uco (OpenERP) <uco@tinyerp.com>

Thu, 28 Oct 2010 07:05:42 +0000 (12:35 +0530)
author uco (OpenERP) <uco@tinyerp.com>
Thu, 28 Oct 2010 07:05:42 +0000 (12:35 +0530)
committer uco (OpenERP) <uco@tinyerp.com>
Thu, 28 Oct 2010 07:05:42 +0000 (12:35 +0530)
diff --cc addons/hr_payroll/hr_payroll.py
Simple merge
diff --cc addons/hr_payroll_account/__openerp__.py
Simple merge
diff --cc addons/survey/report/survey_browse_response.py
Simple merge
author	uco (OpenERP) <uco@tinyerp.com>
	Thu, 28 Oct 2010 07:05:42 +0000 (12:35 +0530)
committer	uco (OpenERP) <uco@tinyerp.com>
	Thu, 28 Oct 2010 07:05:42 +0000 (12:35 +0530)
		1	2
addons/hr_payroll/hr_payroll.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/hr_payroll_account/__openerp__.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/survey/report/survey_browse_response.py	patch \|	diff1 \|	diff2 \|	blob \| history