merge of 9283ad401412a7de1e13fc4899546b7284a153b5
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 12:47:12 +0000 (12:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 12:47:12 +0000 (12:47 +0000)
     and a2bc17f339e13b200d5648353907d765b53353d5


Trivial merge