Revert "Fix for scheduling conflicts, address fred's comments"

This reverts commit 96ca46cf87 which broke building tests on master.

Change-Id: I7e712d03b42cd25e22c0a8e72cf4e4526cd412e1
This commit is contained in:
Torne (Richard Coles)
2013-08-12 10:26:57 +00:00
parent 73f926225c
commit 4890b085fb
15 changed files with 1442 additions and 2277 deletions

File diff suppressed because it is too large Load Diff