merge of 65c95bf6c423272c963b3df3c62c0fcee9c7cf71
authorRod Whitby <rod@whitby.id.au>
Sun, 24 Dec 2006 19:33:37 +0000 (19:33 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 24 Dec 2006 19:33:37 +0000 (19:33 +0000)
     and d8670101441cce06c80c24c89849483f07ea1729


Trivial merge