merge of '60f25719f044f04c78ec8cfa8af6a503b643df4e'
authorRod Whitby <rod@whitby.id.au>
Sun, 27 May 2007 12:02:20 +0000 (12:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 27 May 2007 12:02:20 +0000 (12:02 +0000)
     and '920cdb6aefe97d8f4b6c86d0b508d346ff55fb5f'


Trivial merge