[FIX] Errors in addons/mrp/mrp.py and addons/stock/product.py
Merge branch 'pep8' into cleaned-alfa

Conflicts:
	openerp/addons/base/ir/ir_actions.py
	setup.py
Merge branch 'cleaned-alfa' of github.com:jhg/odoo into cleaned-alfa