merge of 64153b2d48a859d15b3243a0e2e761097c866ca6
authorRod Whitby <rod@whitby.id.au>
Mon, 16 Oct 2006 13:16:15 +0000 (13:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 16 Oct 2006 13:16:15 +0000 (13:16 +0000)
     and c537c01e7d6616ebcada76c38a57714d8994d6e2


Trivial merge