merge of 985cd9592c6d9e0954da67619b51350d779b9715
authorRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 11:16:20 +0000 (11:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 25 Aug 2006 11:16:20 +0000 (11:16 +0000)
     and d1b15f2093236fb8de52da23e480b891b397e184


Trivial merge