merge of '3fa699bc0a61f0428ee89c547a1c840aeaa076c3'
authorRod Whitby <rod@whitby.id.au>
Wed, 19 Dec 2007 06:52:24 +0000 (06:52 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 19 Dec 2007 06:52:24 +0000 (06:52 +0000)
     and '7d09f4b4eadc0654db7add3b9a29d77f0350e9a9'


Trivial merge