Merge branch 'master' of /scm/spider
authorDirk Koopman <djk@tobit.co.uk>
Fri, 2 Nov 2007 16:19:11 +0000 (17:19 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Fri, 2 Nov 2007 16:19:11 +0000 (17:19 +0100)

Trivial merge