merge of '8f2faed526c135c5bf4913b322ad0cd349505c22'
authorRod Whitby <rod@whitby.id.au>
Wed, 14 Mar 2007 03:52:57 +0000 (03:52 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 14 Mar 2007 03:52:57 +0000 (03:52 +0000)
     and 'cc93779f06baa487b5fd2c375007139a847b0bd6'


Trivial merge