[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120605122830-r3o25y55lzo0o73n
bzr revid: psi@tinyerp.com-20120606103845-w2jftpw5jw706pgo

diff --cc addons/account/account_view.xml
Simple merge

diff --cc addons/crm/crm_lead_view.xml
Simple merge

diff --cc addons/crm/crm_meeting_view.xml
Simple merge

diff --cc addons/crm/crm_phonecall_view.xml
Simple merge

diff --cc addons/crm_claim/crm_claim_view.xml
Simple merge

diff --cc addons/crm_fundraising/crm_fundraising_view.xml
Simple merge

diff --cc addons/crm_helpdesk/crm_helpdesk_view.xml
Simple merge

diff --cc addons/hr/hr_view.xml
Simple merge

diff --cc addons/hr_evaluation/hr_evaluation_view.xml
Simple merge

diff --cc addons/hr_expense/hr_expense_view.xml
Simple merge

diff --cc addons/hr_holidays/hr_holidays_view.xml
Simple merge

diff --cc addons/hr_payroll/hr_payroll_view.xml
Simple merge

diff --cc addons/hr_recruitment/hr_recruitment_view.xml
Simple merge

diff --cc addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
Simple merge

diff --cc addons/lunch/lunch_view.xml
Simple merge

diff --cc addons/marketing_campaign/marketing_campaign_view.xml
Simple merge

diff --cc addons/point_of_sale/point_of_sale_view.xml
Simple merge

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/project_issue/project_issue_view.xml
Simple merge

diff --cc addons/project_long_term/project_long_term_view.xml
Simple merge

diff --cc addons/project_scrum/project_scrum_view.xml
Simple merge

diff --cc addons/purchase/purchase_view.xml
Simple merge

diff --cc addons/sale/sale_view.xml
Simple merge

diff --cc addons/sale_crm/sale_crm_view.xml
Simple merge

diff --cc addons/stock/stock_view.xml
Simple merge

diff --cc addons/subscription/subscription_view.xml
Simple merge

diff --cc addons/survey/survey_view.xml
Simple merge