merge of a05ce2cbb8b0534ea1033d1d848c29650132ebc1
authorRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 14:46:06 +0000 (14:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 14:46:06 +0000 (14:46 +0000)
     and b60b9cbd9811d42fdfd03aae3fb9d35d428d7ddc


Trivial merge