merge of 2f49a884ba2f2311a9ad9c1708a9b4e43bd98d9c
authorRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 19:32:41 +0000 (19:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 19:32:41 +0000 (19:32 +0000)
     and 6b1d3777dd06ae01dc9fb60860881b831f0c0659


Trivial merge