merge of 01ea9bb518cc745e8d29558c0bf3e1836a903605
authorRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 12:01:15 +0000 (12:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 12:01:15 +0000 (12:01 +0000)
     and 66f4e0ab9111d2b6004a362cd4ce9ada04063719


Trivial merge