Merge branch 'master' of ponder:~mwooding/doc/dnd into temp
authorMark Wooding <mdw@distorted.org.uk>
Mon, 14 May 2007 17:06:57 +0000 (18:06 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 14 May 2007 17:06:57 +0000 (18:06 +0100)
commit7656247b22c7e2e1c7683eb708900cd367f706b3
tree58faa0094c7863cbb8eae5eb71573f22d3825623
parent6d54ef35f17b0c9255a3a7914df26f8a1160dd32
parent6b7540401c16911730a63ca2288403ea862442de
Merge branch 'master' of ponder:~mwooding/doc/dnd into temp

* 'master' of ponder:~mwooding/doc/dnd:
  various changes