Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/catacomb/
authorMark Wooding <mdw@ncipher.com>
Wed, 22 Nov 2006 11:38:39 +0000 (11:38 +0000)
committerMark Wooding <mdw@ncipher.com>
Wed, 22 Nov 2006 11:38:39 +0000 (11:38 +0000)

Trivial merge