merge of 51907f614e214b34cb5e4bf9b6d09835a6e424d8
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 22:01:16 +0000 (22:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 22:01:16 +0000 (22:01 +0000)
     and 600431c30c745c91d5212796f215dab9a6d4864d


Trivial merge