merge of '879c2e35f17da4b01ea93a7d8a286583b9eec1f6'
authorRod Whitby <rod@whitby.id.au>
Mon, 12 Feb 2007 06:16:39 +0000 (06:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 12 Feb 2007 06:16:39 +0000 (06:16 +0000)
     and 'bae5b516fbb7c4ed7939b4dbb39c62866ef76d98'


Trivial merge