merge of '8ee01e7aef977a6c51cf71b7d11f65f42e0dc413'
authorRod Whitby <rod@whitby.id.au>
Wed, 21 Mar 2007 21:38:55 +0000 (21:38 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 21 Mar 2007 21:38:55 +0000 (21:38 +0000)
     and 'd07eaeb51c5675395c6cc80234897311d1758505'


Trivial merge