merge of '013c9a6736103814cf89a1574dfe2565f15bd752'
authorRod Whitby <rod@whitby.id.au>
Fri, 6 Apr 2007 20:08:43 +0000 (20:08 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 6 Apr 2007 20:08:43 +0000 (20:08 +0000)
     and 'a644b58a8bd61406bf2114851bc485615eb11ea2'


Trivial merge