merge of '5a015d1c49983568aacf29859d863463069aca15'
authorRod Whitby <rod@whitby.id.au>
Fri, 9 Mar 2007 12:44:34 +0000 (12:44 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 9 Mar 2007 12:44:34 +0000 (12:44 +0000)
     and 'd78faded4fa134ff4c66a3d2b9ed2dcf62dbfb43'


Trivial merge