Commit 546be35cc7545a1c8b33e3fa6a7a41d7f10e2f44

Con Kolivas 2013-05-18T13:16:17

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