merge of 7e13a86ae2bbc736c48cab6979535e57625e044c
authorRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 09:47:01 +0000 (09:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 09:47:01 +0000 (09:47 +0000)
     and b564b6d6b3a9c27b19d4ef502731dc9714e94e68


Trivial merge