merge of '5f324e98b61ec50554d929eb59723aaef495ef64'
authorRod Whitby <rod@whitby.id.au>
Sat, 18 Aug 2007 05:20:51 +0000 (05:20 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 18 Aug 2007 05:20:51 +0000 (05:20 +0000)
     and 'f857f14193d6f1cf2150da9e6a84070b69b7dd1d'


Trivial merge