Commit 47f0739fbf80b60c2df68770051aa05a6f96cf6f

henry 2001-09-14T01:13:39

Updated for changes made while in the UK