merge of '31f5a286594a5bbefbd62d34485ab695172c7f17'
authorRod Whitby <rod@whitby.id.au>
Thu, 6 Sep 2007 20:51:53 +0000 (20:51 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 6 Sep 2007 20:51:53 +0000 (20:51 +0000)
     and 'abf691e484310ced8674e16092ab962cb2d94941'


Trivial merge