merge of '79d34a19d4d6d66f0f6f81fdef4e9e0888e8aab8'
authorRod Whitby <rod@whitby.id.au>
Fri, 6 Apr 2007 10:52:49 +0000 (10:52 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 6 Apr 2007 10:52:49 +0000 (10:52 +0000)
     and 'e1cfaab20da752e1b81ee334dc0363e1a060b89b'


Trivial merge