Merge branch 'kernels' of github.com:ckolivas/cgminer into kernels Conflicts: configure.ac device-gpu.c poclbm120203.cl