merge of 8e70c657432711b9476107b037996da27e818d0f
authorRod Whitby <rod@whitby.id.au>
Wed, 23 Aug 2006 13:16:15 +0000 (13:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 23 Aug 2006 13:16:15 +0000 (13:16 +0000)
     and fa6270678277b8347a7ef3d59eba69130a96d554


Trivial merge