merge of '34e476df3adb31518eca1a4d01727fe9d5ebac77'
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Feb 2007 13:52:29 +0000 (13:52 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 5 Feb 2007 13:52:29 +0000 (13:52 +0000)
     and 'b30c0de0e6bb4763443fba8d9008bc092b0ad454'


Trivial merge