cambios
Merge branch 'master' of github.com:jmesteve/openerp

ok

Conflicts:
	dist/openerp-7.0-py2.7.egg
	openerp.egg-info/SOURCES.txt