merge of 825f6cc895ba9ef144a4cea48421e9d184fabd24
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 09:17:13 +0000 (09:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 09:17:13 +0000 (09:17 +0000)
     and b85e59f79c3d254c7098d7f930f8b20abb357dd6


Trivial merge