Commit 0d920697604c00e8eb66455ea00d5f12eaf488ed

Luke Dashjr 2012-04-21T03:32:57

Merge branch 'master' into align_temps Conflicts: cgminer.c