Upgraded

After a couple of attempts, I managed to upgrade both this site and Liams' site to drupal-4.7cvs.  The first couple of times I was having weird issues such as everything looking ok but no content.  However this time it seems that the database upgrade script did it's thing mostly the right way and we've now got a site with more functionality.