merge of '4b62fa79052d762d8ae8226a013c16c6ee6aa842'
authorRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 00:35:19 +0000 (00:35 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 00:35:19 +0000 (00:35 +0000)
     and 'f246f66dc73bb9a4a723a8abd18f7d6b1a116411'


Trivial merge