merge of '1cc47f2936bc6346f6e03128eb46345963c599a3'
authorRod Whitby <rod@whitby.id.au>
Sun, 9 Sep 2007 11:59:45 +0000 (11:59 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 9 Sep 2007 11:59:45 +0000 (11:59 +0000)
     and '4d05fe1b9b1c9939ad7429871e3fbf805a8d316b'


Trivial merge