merge of 'ae89f1087a609da6b249b64690b468f4dcfcceee'
authorRod Whitby <rod@whitby.id.au>
Fri, 7 Sep 2007 23:13:39 +0000 (23:13 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 7 Sep 2007 23:13:39 +0000 (23:13 +0000)
     and 'b6d3200d932c1e277015164a4e83ea009d96872f'


Trivial merge