Mirkoddd/CPUSpyReborn — pull request #18 by Avinash-Bhat (2013-06-29 19:55:29+00:00)
Title: #17 fix for unresolved merge

unresolved conflict committed at fbf3c03