merge of '8b02ed625372878189c957c2c7819f780350ab61'
authorRod Whitby <rod@whitby.id.au>
Fri, 30 Mar 2007 02:39:26 +0000 (02:39 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 30 Mar 2007 02:39:26 +0000 (02:39 +0000)
     and 'fb808adcfea54d1d3fc262b6ee51bee107cf33dc'


Trivial merge