merge of 17fc8adec6d502462c6f0f5c22d99090aa08294d
authorRod Whitby <rod@whitby.id.au>
Thu, 28 Dec 2006 18:17:17 +0000 (18:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 28 Dec 2006 18:17:17 +0000 (18:17 +0000)
     and b71e3dad61b98373edf20e7c3e828b6a864720e2


Trivial merge