merge of '7c2eec63193c90446b069e73cca7fa162538fb4a'
authorRod Whitby <rod@whitby.id.au>
Sun, 11 Mar 2007 13:53:48 +0000 (13:53 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 11 Mar 2007 13:53:48 +0000 (13:53 +0000)
     and 'f64f76da145d0ecd8967b8f45a684d465d56b6c2'


Trivial merge