[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp...

bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx

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

diff --cc addons/crm/crm_lead.py
Simple merge

diff --cc addons/delivery/stock.py
Simple merge

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

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

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

diff --cc addons/stock/product.py
Simple merge

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