Merged docs from paul
authorMatthew Wild <mwild1@gmail.com>
Wed, 8 Oct 2008 16:20:11 +0000 (17:20 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 8 Oct 2008 16:20:11 +0000 (17:20 +0100)

Trivial merge