Commit 22e677f4d6c81b1d4abd23d714aeae6d31fc180c

Con Kolivas 2013-05-17T21:25:38

Merge branch 'icarus-dev' of github.com:ckolivas/cgminer into icarus-dev