merge of '5af140b58c366d08abd2b54ab2841ebc30096bb7'
authorRod Whitby <rod@whitby.id.au>
Mon, 19 Mar 2007 20:49:19 +0000 (20:49 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 19 Mar 2007 20:49:19 +0000 (20:49 +0000)
     and 'aacdb60f5bfa12064cfe4e9a75a2eba06e2da3cc'


Trivial merge