Merge branch 'master' of ssh://dirk@server/scm/spider
authorDirk Koopman <djk@tobit.co.uk>
Fri, 15 Jun 2007 13:58:24 +0000 (14:58 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Fri, 15 Jun 2007 13:58:24 +0000 (14:58 +0100)

Trivial merge