merge of e456e0a150e36bfe28fe9301fd0c8286fbb0073b
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 11:46:14 +0000 (11:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 11:46:14 +0000 (11:46 +0000)
     and e8151982a696cd92a6f4a1f65d8907778bf60836


Trivial merge