merge of '33469de643b1cad4022de73b7ce97d808320e465'
authorRod Whitby <rod@whitby.id.au>
Sat, 18 Aug 2007 13:46:30 +0000 (13:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 18 Aug 2007 13:46:30 +0000 (13:46 +0000)
     and 'f012bf85fd4c2065b5824f7a0b63bb0a53cccb06'


Trivial merge