merge of '5075b3f69144c8ca977abda48869d41f724d1334'
authorRod Whitby <rod@whitby.id.au>
Fri, 30 Mar 2007 13:06:17 +0000 (13:06 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 30 Mar 2007 13:06:17 +0000 (13:06 +0000)
     and 'aa4ab028a887106c3acd17349f4957692343e352'


Trivial merge