Merge branch 'master' of ssh://joe@milbourn.org.uk/home/joe/git/wikirepo
authorJoe Milbourn <joe.milbourn+git@gmail.com>
Mon, 26 Oct 2009 12:51:21 +0000 (12:51 +0000)
committerJoe Milbourn <joe.milbourn+git@gmail.com>
Mon, 26 Oct 2009 12:51:21 +0000 (12:51 +0000)

Trivial merge