merge of '63f976f7eeeabc5489e45b1df04c88319cd77447'
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Jun 2007 22:11:20 +0000 (22:11 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Jun 2007 22:11:20 +0000 (22:11 +0000)
     and 'f20a9853a5bcc15b88f7b9aa12eedd2fd6d65ec3'


Trivial merge