merge of '8cf0ade6025c07f6fb2d8dcb863a8e6b345dddaa'
authorRod Whitby <rod@whitby.id.au>
Wed, 9 May 2007 05:44:30 +0000 (05:44 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 9 May 2007 05:44:30 +0000 (05:44 +0000)
     and 'e7a885c65fac678637bdc0153d73dafaa9bb1608'


Trivial merge