merge of 18f668005ae8b816cbb685308d7763c7de8ed15a
authorRod Whitby <rod@whitby.id.au>
Wed, 23 Aug 2006 12:16:19 +0000 (12:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 23 Aug 2006 12:16:19 +0000 (12:16 +0000)
     and 488c9a7c1f4d87055460407f126116107e233be5


Trivial merge