merge of '6c724cac38fa83333dc1dd0ce02015e549cb9ca1'
authorRod Whitby <rod@whitby.id.au>
Sun, 8 Apr 2007 11:58:09 +0000 (11:58 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 8 Apr 2007 11:58:09 +0000 (11:58 +0000)
     and '80ee64e09db344dd5a70a48ac03865ded7f9eb09'


Trivial merge