merge of a0f14f1eefe4a650f8095ac1b70dcdd9c1e2e16c
authorRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 18:01:08 +0000 (18:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 19 Aug 2006 18:01:08 +0000 (18:01 +0000)
     and bb54c56849b9b51c3c909bc68b84a54c36466514


Trivial merge