Paul Austen - 2010-06-08

patch file + two other files as detailed in message