merge of f03a533684fde29af8a23703055c06f071458ab1
authorRod Whitby <rod@whitby.id.au>
Fri, 29 Dec 2006 19:17:00 +0000 (19:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 29 Dec 2006 19:17:00 +0000 (19:17 +0000)
     and fe8aa989bb329724151b1ae11e021e80ec7ff5f5


Trivial merge