merge of '69c4f0caa0e5f093ca29b5c0346241936d777f83'
authorRod Whitby <rod@whitby.id.au>
Sun, 20 May 2007 13:13:23 +0000 (13:13 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 20 May 2007 13:13:23 +0000 (13:13 +0000)
     and '8f7fdc42175bc408f61d4e4b98b0def52196fd3b'


Trivial merge