Experimento# Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/ic-ufjf/oclEurekaOptima

Conflicts:
	trunk/src/ocl/EG/TesteP4.sh~