Commit 6b11d4e4cccf7d401fe86c66d7e36c920891eb22

Con Kolivas 2012-07-03T22:19:41

Merge pull request #252 from pshep/master More timing changes