merge of '2f5488a316106b94b9b819b0cca9b23352724d0f'
authorRod Whitby <rod@whitby.id.au>
Fri, 1 Dec 2006 20:23:34 +0000 (20:23 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 1 Dec 2006 20:23:34 +0000 (20:23 +0000)
     and 'ccb9ca1370f5bfcbef794de33758dbc89a29055f'


Trivial merge