merge of 0761b04e198d6b93e945ee8583c37967707fa0cc
authorRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 09:32:29 +0000 (09:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 09:32:29 +0000 (09:32 +0000)
     and 50c5c306abf38a20f4b95edfc4146fe90deec59e


Trivial merge