merge of '635d3a2471165977b7c08b84e9174108c404c6a1'
authorRod Whitby <rod@whitby.id.au>
Mon, 19 Feb 2007 12:32:54 +0000 (12:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 19 Feb 2007 12:32:54 +0000 (12:32 +0000)
     and '9148d2b8d041bbdbb9d9cbfa12c0c385ed6f0c7b'


Trivial merge