merge of 6d5e280f97056828cda3dfddd3b587deb43de909
authorRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 22:47:10 +0000 (22:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 22:47:10 +0000 (22:47 +0000)
     and ceae4a8f497f23a63ce5818c0874acbac77f2205


Trivial merge