nm
Merge branch 'master' of git@github.com:wimvanderbauwhede/OpenCLIntegration
nm
nm
Merge branch 'master' of git@github.com:wimvanderbauwhede/OpenCLIntegration

Conflicts:
	OclBuilder.py