merge of 0fcc0eb9ebe0187095f35e237c3bd3a2093a4ef3
authorRod Whitby <rod@whitby.id.au>
Wed, 27 Dec 2006 10:47:22 +0000 (10:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 27 Dec 2006 10:47:22 +0000 (10:47 +0000)
     and 5d3b23f0c6195c7b5918319e8a2676f3c767a0ab


Trivial merge