merge of '5e7d92a4f32f02a84db8e661648ed70184fe038d'
authorRod Whitby <rod@whitby.id.au>
Tue, 29 May 2007 01:23:50 +0000 (01:23 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 29 May 2007 01:23:50 +0000 (01:23 +0000)
     and '6ff9b399b6c7eab81fecfb284a0763acbc4a4ee3'


Trivial merge