merge of 48ae35df5bbd7e08a5f1ce6f0ef4e35abc956615
authorRod Whitby <rod@whitby.id.au>
Sun, 27 Aug 2006 17:31:19 +0000 (17:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 27 Aug 2006 17:31:19 +0000 (17:31 +0000)
     and b4baa952a21796f3da8adaf6acd8c844668a33d8


Trivial merge