merge of 688adfee85a259aa7c8d509449ef062c0b6aa923
authorRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 22:16:36 +0000 (22:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 22:16:36 +0000 (22:16 +0000)
     and f1283b897469ab024842df137e48790f1c8e37f4


Trivial merge