merge of 34964becdd90604942aa0cbe5287253c829dbfa3
authorRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 17:01:18 +0000 (17:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 17:01:18 +0000 (17:01 +0000)
     and afab498efbb1b2ed67ef3d565b65517b1966d81d


Trivial merge