merge of '19f950ca4a0d912a0ac8680d3b82d52f11fc2cd0'
authorRod Whitby <rod@whitby.id.au>
Fri, 28 Mar 2008 03:58:54 +0000 (03:58 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 28 Mar 2008 03:58:54 +0000 (03:58 +0000)
     and 'dd15f7f49322c01bcd6b9e0738b3452ab727d348'


Trivial merge