merge of '2a4ed2b247005e6fa3609f9d3c300ed0c933215d'
authorRod Whitby <rod@whitby.id.au>
Sun, 1 Apr 2007 23:24:53 +0000 (23:24 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 1 Apr 2007 23:24:53 +0000 (23:24 +0000)
     and 'd0db74174ddb4a1c1deffe220a9c89d078e8f640'


Trivial merge