merge of 44da8efcf85940e173cd83b2ea95fa7ae8782bb5
authorRod Whitby <rod@whitby.id.au>
Sun, 31 Dec 2006 06:17:22 +0000 (06:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 31 Dec 2006 06:17:22 +0000 (06:17 +0000)
     and ecc0691181110504ec5634ccb6366af8a520ff04


Trivial merge