merge of 4a577a9951c18f1d0fc283b8283e170639de59d6
authorRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 15:16:24 +0000 (15:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 15:16:24 +0000 (15:16 +0000)
     and c465e626ca49133142206eea25d099369d10040a


Trivial merge