merge of 8eaefa4f638dc67e29fb59fca3c6a98e4049eb09
authorRod Whitby <rod@whitby.id.au>
Sun, 24 Dec 2006 10:17:54 +0000 (10:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 24 Dec 2006 10:17:54 +0000 (10:17 +0000)
     and 960ec1ce1ce07462d6b9bf9eab1de5bcd2ba1102


Trivial merge