merge of 4569ccd3ba47dcb3b8065262d72969eb75349a14
authorRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 14:16:23 +0000 (14:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 14:16:23 +0000 (14:16 +0000)
     and 9062ecf12276bf22e45407251118d15448a7679c


Trivial merge