merge of '51d0f00ea24bf874bc2c6cba6bc21afbfaf45752'
authorRod Whitby <rod@whitby.id.au>
Mon, 10 Dec 2007 07:43:38 +0000 (07:43 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 10 Dec 2007 07:43:38 +0000 (07:43 +0000)
     and 'f972c41c1f6486c101e57f2c1ab5b141b3e90e91'


Trivial merge