merge of '8b37dea089f02d115ec3e3af14478ea8264ad822'
authorRod Whitby <rod@whitby.id.au>
Tue, 5 Jun 2007 23:57:27 +0000 (23:57 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 5 Jun 2007 23:57:27 +0000 (23:57 +0000)
     and 'cc77b9d135248dc8b58b6894e8ed95dcbd474752'


Trivial merge