merge of 0a58f4bb38e4c4f16d2ea1b30c5a3e80f4cc86c6
authorRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 11:32:16 +0000 (11:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 15 Dec 2006 11:32:16 +0000 (11:32 +0000)
     and 7354dcc33b488ae39adddd4e04a719ca3928cb3a


Trivial merge