merge of 14913ea896b200b8793c1a74b43586b44451a471
authorRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 11:02:26 +0000 (11:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 11:02:26 +0000 (11:02 +0000)
     and e6282b8a6c27894ff62776a8cd275d5f0a9a0efd


Trivial merge