merge of '9c4b64659a16cc8199d699552bbcf5c4e5ca467d'
authorRod Whitby <rod@whitby.id.au>
Sun, 15 Apr 2007 21:16:35 +0000 (21:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 15 Apr 2007 21:16:35 +0000 (21:16 +0000)
     and 'f9425e5aeadca35133e2a6491707c9e291d4a6fe'


Trivial merge