merge of '64b6093032eef8f7c38258a8a93dfdc4ea46c39c'
authorRod Whitby <rod@whitby.id.au>
Fri, 27 Apr 2007 20:32:26 +0000 (20:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 27 Apr 2007 20:32:26 +0000 (20:32 +0000)
     and 'df36391938bd296ae238e5e7c286a075be0015a6'


Trivial merge