merge of '33512049e02cf7c8e5bd9b457c06f88047a373bb'
authorRod Whitby <rod@whitby.id.au>
Sun, 10 Jun 2007 03:12:46 +0000 (03:12 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 10 Jun 2007 03:12:46 +0000 (03:12 +0000)
     and '338a4c3a2eeb15c49e9ff9d0d90fb71ab1ddad3a'


Trivial merge