merge of 63008daf27328c2ed40b755ed2f79949ddb01818
authorRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 15:47:06 +0000 (15:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 25 Dec 2006 15:47:06 +0000 (15:47 +0000)
     and 9f4b88f2eb3af46a32b6c78826cca8aae6d89268


Trivial merge