[MERGE] merge trunk into local branch

addons/account/account.py

addons/account/account_move_line.py

addons/account/wizard/account_fiscalyear_close.py

addons/account_anglo_saxon/test/anglo_saxon.yml

addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml

addons/account_voucher/account_voucher.py

addons/analytic/analytic.py

addons/base_calendar/base_calendar_data.xml

addons/base_calendar/crm_meeting_view.xml

addons/base_calendar/security/ir.model.access.csv

addons/base_setup/res_config.py

addons/base_setup/res_config_view.xml

addons/calendar/__init__.py

addons/calendar/__openerp__.py

addons/calendar/base_calendar_view.xml

addons/calendar/calendar.py

addons/calendar/calendar_data.xml

addons/calendar/calendar_demo.xml

addons/calendar/calendar_view.xml

addons/calendar/contacts.py