merge of '683035d547a30c5f79f681170ee31566e22d5ed6'
authorRod Whitby <rod@whitby.id.au>
Sat, 18 Aug 2007 12:52:06 +0000 (12:52 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 18 Aug 2007 12:52:06 +0000 (12:52 +0000)
     and '9ff0f129c558fe9930febe6662f830fa9069d3b4'


Trivial merge