merge of '10e3e8503cd12f71134f272902a552ed6ae0be48'
authorRod Whitby <rod@whitby.id.au>
Sat, 14 Apr 2007 00:22:22 +0000 (00:22 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 14 Apr 2007 00:22:22 +0000 (00:22 +0000)
     and 'eb905eee009ae6abb1d415de432f62c123e04dbb'


Trivial merge