merge of '7591223f9cc09ec1cac67f361556f5e52509ce2e'
authorRod Whitby <rod@whitby.id.au>
Mon, 2 Apr 2007 09:28:06 +0000 (09:28 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 2 Apr 2007 09:28:06 +0000 (09:28 +0000)
     and 'f5edc19dd1057109ae156f97cd6387f3a74993fe'


Trivial merge