merge of c6f51b08eabf922e93feada29159ba2de2a5caec
authorRod Whitby <rod@whitby.id.au>
Tue, 5 Sep 2006 01:16:34 +0000 (01:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 5 Sep 2006 01:16:34 +0000 (01:16 +0000)
     and d392153f540fb53432b333f95c079d221f6570f1


Trivial merge