[MERGE] with trunk

bzr revid: tfr@openerp.com-20101110120902-k60lls4irx842pq2

diff --cc addons/hr_payroll/hr_payroll.py
Simple merge

diff --cc addons/hr_payroll/report/report_employees_detail.py
Simple merge

diff --cc addons/hr_payroll/report/report_payroll_advice.py
Simple merge

diff --cc addons/hr_payroll/report/report_payslip.py
Simple merge

diff --cc addons/hr_payroll/report/report_year_salary.py
Simple merge

diff --cc addons/hr_payroll/report/rml_parse.py
Simple merge

diff --cc addons/hr_payroll_account/hr_payroll_account.py
Simple merge

diff --cc addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
Simple merge