merge of '0092188379e9f72acfeb7af2b132c12554d8a515'
authorRod Whitby <rod@whitby.id.au>
Thu, 21 Jun 2007 11:03:12 +0000 (11:03 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 21 Jun 2007 11:03:12 +0000 (11:03 +0000)
     and 'e89c096197c1edb468e2fa9e49482a06b639bf1e'


Trivial merge