Merge branch 'newpc92timings' of /scm/spider into newpc92timings