Brian Smith - 2006-10-29

Patch in diff -u format