merge of '7d911a2d488420f755862dde3e5c82e43913c991'
authorRod Whitby <rod@whitby.id.au>
Tue, 26 Jun 2007 08:14:09 +0000 (08:14 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 26 Jun 2007 08:14:09 +0000 (08:14 +0000)
     and '999d34f6a16eb76013607894a0608c627e0279a1'


Trivial merge