merge of '4174da17cc76d0fa9a74373c4588dcabac058e35'
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Jun 2007 07:55:16 +0000 (07:55 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Jun 2007 07:55:16 +0000 (07:55 +0000)
     and 'b3b0a8850deffddd2c3a43b7bc7c142279e70463'


Trivial merge