merge of 'af9c4bad732edd2f3538bbcc59c4aa70520a54e1'
authorRod Whitby <rod@whitby.id.au>
Sun, 27 May 2007 23:42:30 +0000 (23:42 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 27 May 2007 23:42:30 +0000 (23:42 +0000)
     and 'e35c79c0e44e6a58add42e2dc50ecfaad4e02c0e'


Trivial merge