merge of 12aefbb866697c7ce0a93febeaa40af2622a8ac2
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 17:17:56 +0000 (17:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 17:17:56 +0000 (17:17 +0000)
     and 29f0b10dc5e62ff3a65a17a998198e438d36f80f


Trivial merge