merge of '6e3d378d98664dd166068b0a10b4908d224b2da6'
authorRod Whitby <rod@whitby.id.au>
Fri, 9 Mar 2007 16:38:23 +0000 (16:38 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 9 Mar 2007 16:38:23 +0000 (16:38 +0000)
     and 'cc42f5920681427f906758dd8c3c6cdc74d5952e'


Trivial merge