merge of 3afa4204843151e66efd20aa7c9a8f7145e29206
authorRod Whitby <rod@whitby.id.au>
Thu, 17 Aug 2006 15:01:41 +0000 (15:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 17 Aug 2006 15:01:41 +0000 (15:01 +0000)
     and 77a7289b4730d176a72d4d104b882642824bfda3


Trivial merge