Commit 3b04a306b700b755563647fbb6c7b11aae83a9ee

Con Kolivas 2013-10-28T11:37:13

Merge branch 'master' into kncminer