RM Fleming - 2007-06-29

patch for above (diff -u 5)