merge of '93cd24c7fe5b0752c90fe9cc0ccbb8f1b492f27e'
authorRod Whitby <rod@whitby.id.au>
Thu, 22 Mar 2007 08:21:49 +0000 (08:21 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 22 Mar 2007 08:21:49 +0000 (08:21 +0000)
     and 'b4591a330f9fcf7b099ca3aa7814c991db5f10dc'


Trivial merge