merge of '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'
authorRod Whitby <rod@whitby.id.au>
Fri, 7 Sep 2007 17:15:39 +0000 (17:15 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 7 Sep 2007 17:15:39 +0000 (17:15 +0000)
     and '453784163e85d585c492f5db88b0fcbc9a68b398'


Trivial merge