merge of '3d4a85aa2c2724b95dcfd705b2078392bd5fe7fa'
authorRod Whitby <rod@whitby.id.au>
Mon, 28 May 2007 22:29:51 +0000 (22:29 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 28 May 2007 22:29:51 +0000 (22:29 +0000)
     and 'ed8e9ddaa8dd95860ce2c4ae76ec55966ab9f78c'


Trivial merge