merge of 4ef7d8284f0d97d988fd30fed264146c8f80a8f9
authorRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 15:35:13 +0000 (15:35 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 15:35:13 +0000 (15:35 +0000)
     and b9f3335735a096f0257f25478a5ccd62c0c7c33f


Trivial merge