merge of 03732add4769957990129688c26e863118020e5e
authorRod Whitby <rod@whitby.id.au>
Sun, 20 Aug 2006 13:16:17 +0000 (13:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 20 Aug 2006 13:16:17 +0000 (13:16 +0000)
     and e50520839964c08c9cfd593b957f1efb58c951aa


Trivial merge