Buchan Milne - 2008-10-06

Patch including the files for this test