merge of 218a25224a00ea088b998fa5b64c604a674f4d0f
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 21:47:18 +0000 (21:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 21:47:18 +0000 (21:47 +0000)
     and f80ec3fe1400feec5eddda8e5bb073be549dee55


Trivial merge