merge of '6ba440770253a20d17a68175abe67875c69ce828'
authorRod Whitby <rod@whitby.id.au>
Sat, 22 Sep 2007 08:11:55 +0000 (08:11 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 22 Sep 2007 08:11:55 +0000 (08:11 +0000)
     and 'd68560eb3e0b38837e6e007a6f82559194d984da'


Trivial merge