[MERGE] merged with main addons

addons/account/i18n/en_GB.po

addons/account_analytic_analysis/i18n/mk.po

addons/account_coda/i18n/sl.po

addons/account_followup/__openerp__.py

addons/account_followup/account_followup_demo.xml

addons/account_followup/wizard/account_followup_print.py

addons/base_action_rule/__openerp__.py

addons/base_action_rule/base_action_rule.py

addons/base_calendar/__openerp__.py

addons/base_calendar/base_calendar.py

addons/base_crypt/i18n/sl.po

addons/base_vat/base_vat.py

addons/crm/__openerp__.py

addons/crm/crm.py

addons/crm/crm_action_rule.py

addons/crm/crm_lead.py

addons/crm/crm_lead_view.xml

addons/crm/crm_meeting.py

addons/crm/crm_phonecall.py

addons/crm/crm_view.xml