Merge docs from waqas
authorMatthew Wild <mwild1@gmail.com>
Sat, 4 Oct 2008 14:35:28 +0000 (15:35 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 4 Oct 2008 14:35:28 +0000 (15:35 +0100)

Trivial merge