merge of 494ea06a4f82effd0cdf1130447f2e7a450002d8
authorRod Whitby <rod@whitby.id.au>
Wed, 23 Aug 2006 14:01:19 +0000 (14:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 23 Aug 2006 14:01:19 +0000 (14:01 +0000)
     and df180402f0f087c183887b23f644f25f1e4f3df6


Trivial merge