merge of '21fe2445ed0bb510a34a0e01c77e30f0e6c021c3'
authorRod Whitby <rod@whitby.id.au>
Tue, 1 May 2007 10:22:08 +0000 (10:22 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 1 May 2007 10:22:08 +0000 (10:22 +0000)
     and '28d894c206a3bfee24708913d7b2a4fbdfca447e'


Trivial merge