merge of '53e411470094db53a09956f80b4ee9fe381960bd'
authorRod Whitby <rod@whitby.id.au>
Tue, 13 Feb 2007 19:48:39 +0000 (19:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 13 Feb 2007 19:48:39 +0000 (19:48 +0000)
     and 'c847baecc3966625d8ba8f5fa7b9f27ceb72b01f'


Trivial merge