Merge pull request #25 from rjolly/master

Ted eating all CPU on HTC G1