James Johnston - 2006-08-23

Patch file created using diff